Minor fixes for beta release