Remixes of "fix and publish"

Feedback