BTW, I just made the two changes you identified, and it ran fine for me.