Misc fixes to null pointer issues in the GameWorld