Various minor fixes from William Rucklidge.

Change-Id: Ibe731d5db374ad8ee148d62a9fdd8d726b607a3f
3 files changed