All sorts of updates for OoEVV / KEfED / CoSI