Injection fixes