a couple of fixes around mcollective handling of services