Last bit of ServiceManager fixes for security.