Please see the attached patches.  Thanks.