Additional fixes (OMS-192)