r9016: fixes for openmcl