diverse fixes

Signed-off-by: Joachim Dörr <mail@joachim-doerr.com>