fixes to imports