Hi Maxim and Maxime,

Here are the patches. Should have the issues you mentioned fixed.

----
Petr