Fix path handling