Final cleanups for first alpha release.