Minor changes to random OMS, maybe this is unnecessary