Fix some wayward strings

Change-Id: I78355226da50f0135593d23b3f95ae48c686b988