Fixing some more issues

Change-Id: I00d6dbb4e517b0276771ef45982cacd66e98f32d