Small Fixes

Signed-off-by: Andre Schweiger <andre.spiele@yahoo.de>
Small Fixes

Signed-off-by: Andre Schweiger <andre.spiele@yahoo.de>