Fixed some path issues