Small bugfixes

Change-Id: Ic1bf2f0f9d48549b58fe186639efabe772dfc9de
Signed-off-by: Thomas Psota <thomas.psota@iese.fraunhofer.de>
11 files changed