Improved how patching is done.