Move patching to earlier.