Small tweaks for beta release