Some bugs fixed

Hi Ake,
this is a test about how to issue things or how to get bugfixes back to the root. ;-)

Best regards
Andreas