Fix up some strings

Change-Id: Id5351120a11eceea8eabf2bbb9175c7f41e386a4