Few tweaks to SampleDiagnostics