Bugfixes and tweaks from attempting a release.