Added last bug fixes.

Issue-Ref: 4167

Signed-off-by: Andreas Bayha <bayha@fortiss.org>