Hello,

again. Hopefully, I got all coding style rules right this time.
Here my two patches.

Merry Christmas

 Christian