Fixed some small bugs

Signed-off-by: Michael Jostmeyer <michael@josi.de>