minor fixes to Frameworks::Service::Main code
merge