Fixes

Few more changes to prepare for release.

@keithw I think these changes are ready for review! I will get rid of the other pull request for the "cleanups" branch.