More edits

Change-Id: I33514d0c2ac9b432fc5773d9c952949242aea849