Please review the attached patches:
Thanks,
-- Matt