Fix more path issues