Fixes to import speed improvement