Some string corrections

Change-Id: I8ac276c0b96470d669dd90f061645eee5a52eb95