Fix for another 2 beta bugs