more fixes

Signed-off-by: Sven Strickroth <email@cs-ware.de>
more fixes

Signed-off-by: Sven Strickroth <email@cs-ware.de>