Fix 1st batch of beta release bugs