fixup: diagnostics