Small fixes to imports/display