Fix: Minor issues (161,162,163,166)

Signed-off-by: Taggic <taggic@t-online.de>