And a few more fixes

Signed-off-by: marc1706 <admin@m-a-styles.de>