Fix services sourcing