Minor tweaks to 'Register Services' functionality