Fixes

Signed-off-by: Christian Schoenebeck <christian.schoenebeck@gmail.com>