Several minor changes so that the Guice dependency injection seems to fully work.