Injection and error reporting improvements.