Minor enhancements to OECSM