Fix more paths