fixes to service