Some tweaks to where system services are registered.