Thanks for the patch. This will take me a bit to go through. Unless something major jumps out, my inclination is to apply the patch and use follow on patches to fix things up. I will try to get through this by the end of this month. - Sean