More fixes

More fixes and hide the service in the DI.