More fixes and hide services in DI

More fixes and hide the service in the DI.