Fixing things up for publishing