Fixes for Beta5