Consistency tweaks

Change-Id: I743f50c3905451e049feaafe1235112c3fef0c15