Fix some string derps

Change-Id: I8db77888c253561c5da4f1817a57a1a8ea62d205