Fixing issues

Change-Id: I20a8210ebb6256b3691fcd016b78561e4f5ad32d