Tidy up things before release.

(Fixes things that break the release process)