[FIX] More fallout from OCB mrp change