Fix 'Services' getters/setters