Bugfixes for injection