Fix all sorts of path issues