Hi Jens and Morten,
I've taken the liberty of applying your patches to trunk. Thanks for pointing this and coming up with a patch. Please post if other issues are there.
As written in my previous post, I'll look into C::B specific patches (which I've missed out in my previous commit) later. Before I committed the patch I tested it on Win 64 and the build went fine.
Thanks & Regards,
Biplab