Carl-daniel, I will test your patch tonight or tomorrow night. I am going to commit this because I don't like doing cumulative patches. Your patches look fine, and should work fine, but I really am paranoid about testing before commit due to recent problems I had.
Thanks for your patience :-)
ron