Build fixes for new beta version