kleinere bugfixes

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