Fix lots of bad import behaviour