Fixing up some importing issues