Fixing issues

Change-Id: I624d4a15dcde0571cbd035392c08ec0e7a1e8a30