Injector bugfixes