Fix more wonky imports