Small fixes

Signed-off-by: Christoph Auer <cau@zurich.ibm.com>