Minor modifications done to naming service and executor service.