Package/import fixes