Oo diagnostics and related fixes