Fix missing yields (OMS-345)