Final fixes to import