rOCCI fixes