A few last little things from review

Change-Id: I1d41fae4fcaf509588105d0d6ef0b4d456853f9a
A few more little things

Change-Id: I28c32ea47d448f45d3fd5d0ed6f20d8ff0e9adb1