Source dependencies & facets repaired