Fixed several path issues