Fix various potential NPEs
Changing to beta