Injection fixes to services