Fix other typos

Change-Id: I3f0a51c53efdd383d49d978a1e8531afe9dac896