Injector fixes