Mistake fixes (OMS-239)