Fixes to service control