Bugfixes to previous commit

Change-Id: I8b9ea058f2bf0db09e83095738cf616738de62e7
Signed-off-by: mstegmaier <michael-1.stegmaier@uni-ulm.de>