Small fixes from William Rucklidge.

Change-Id: I0be52f0f1e53cedccffe4807dc664a2f3fb4a8e4
3 files changed