Fix some path issues