Update strings :)

and, try fixing compilation :\

Change-Id: If56aa9d76850b435ec0695b15b9296f9cd465874