more fixes to importing