Fixed some bugs with a package import