Fixed up path issues