Fixed guice bindings