Bugfixes

Change-Id: I132a82ecb8deff5883aeebfc12827ca8eb7dc8f3
Signed-off-by: Martika <Martika@MC2>