Misc edits

Change-Id: I5fb3d38d40f2c3dbcf1e2e16c4037592eb6fdc6b