Fix more path issues for linux