Fixes to import