Fixes to importing