Fix issues discovered during limited testing (OMS-559)