fixed up service definitions