Merge "Fix path issues"