misc changes part 2

Change-Id: Ibbdba00e7b018f58b37fe1c2096fff4ffc17a828