Fixes to Service