Fix strings

Now sure why it was not fix in last batch,.... but here we go

Change-Id: I92b85c759df118381f871eb21cb20cde1735a562