Some changes, to apply the patch.