Let's hear it for one more round of diagnostics fixes