Fixed a few bugs with package loading