Fixed a whole bunch of package oddness.