Guice changes

@hgschmie when I suggest to GitHub that I PR to your PR it says there are no changes.