Misc fixes for first alpha release.