Minor corrections based on Jim Roseborough's comments

Change-Id: I4a8c7a454ddf038a3ed2567c101f9aee582044bf
4 files changed