Yes, many overlaying issues, this is another one I encountered.
I will test your patches soon.
Edit:
Hi, I test your patch, and it works quite well, I think the devs should consider these patches.
By the way, I just copy you patch and created a *.patch file, but when I try to apply the patch using TortoiseSVN, it gives a "Chunk size error" message, so, I have to add to your code manually.