small improvements for injection