Fix a lot of path issues