Update to work with OMV r1157 changes