Diagnostics tweak