Thanks, I installed the attached somewhat-different patch that should 
fix the problems you mentioned.