Addendum to the last two patches.