Lots of service fixes
Fix long running process