Fix RDO patches to work with master branch version