Jeff,
Here's the patches.  Hope these meet your approval!
Allan