fixes all around

Signed-off-by: Karsten Gebbert <karsten@null2.net>