Please review the attached patch which addresses the following issues:

Thanks,
-- Matt