bug fixes

Signed-off-by: Ullrich Buschmann <ullrich.buschmann@hhu.de>