Fix service definitions