Make diagnostics more consistent