Slight rejigging of imports