Change OMD/RP base calculation to warning and event skip