More text fixes

Change-Id: If6c69f7086875ce362cba2b38131aff304a198fd