More changes to the patch.