Small string changes

Change-Id: If9fd9a6da33c6994068a8c0ab587778907632385