Fixed path issues