Latest Yohan's fixes 

I hope that all is right, because I made a little mess with the commits as you can see.