Small changes/bugfixes

Hi guys,

here are another few changes which imo improve usability and compatibility with older code.

Best wishes and a nice weekend,
Michael