Fix service definitions.