Last tweaks to imports/new