Fix services definitions.