Fixes for releasing. Fixes #1

I have these in discrete commits, so I'm happy to drop any.