Fix DBS3 injection; unit tests at least pass.