Fix paths (again)