Fixes to imports