Small corrections

Small corrections. Still needs some more streamlining.

Signed-off-by: Olivier Dobberkau <olivier.dobberkau@dkd.de>