Thanks for the bug report. I installed the attached, which is not quite the same 
as the patches you suggested, but which should address the issues.