Beta weekend hotfixes