Fix startup crashes and login issues

Minor changes to try and reduce launch crashes and login issues experienced by some players