Tweak diag calls a little bit.