diagnostics: Replace 2 more