Weekend beta test hotfixes