Fix more import paths.