Fixes for beta testers