Bugfixes

Change-Id: I5d77c15a4daf326609e9fbe78c2310846d9d113e
Signed-off-by: Martika <martikaschwan@yahoo.de>