Fix issues for Beta5