Fixes to import packages.

So new installations don't crash like crazy go nuts.