Some fixes to import