Fix path issues