Fixes

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