Fixes for first beta release.