Fix string concatenations