Changing to beta
Fix various potential NPEs