A few updates to do things in a guice way.