Minor fixes for switching packages.

This change fixes crashes when switching packages.  There is still a
crash if a world is loaded and then switching packages to another world
it that package does not have a "World 1" world.