Changes to OOF required by last openchange upstream changes