Fix more missing import fixing