Fixed odd path issues