Minor bug fixes
Signed-off-by: BostonShaker <ginfizz@posteo.de>