Added missing injections. Doh.
Added null checks into ContentValuesGenerator.
Fixed incorrect paths in ServerInterface.