Fix more collection paths.