A few changes for more reliable running in service and such with no WebFacade or servlet request in place