Fixes for beta testing version