Minor fixes; not all of them required new strings
as they didn't change meaning.

behatnotneeded

Change-Id: Ic714eeb240a945afa7844c75dd6161899734167d