Correct path issues