Correct and extend patching.