Local paths removed + minor fixes