Fix some more world gen crashes and errors.