Patches to attempt to fix doublecheck.