Two fixes, thanks to "Stefan Kanthak" <skanthak@arcor.de>