Merge fixes from fdcastel to main !

[toninhonunes]

Hello,

I noticed that several bugs have been fixed by fdcastel. When will you be able to merge these changes into the main repository?

Thanks in advance.