Minor Updates

Some minor fixes

Signed-off-by: Simon Kraft <simon@krafit.de>