Fix more concatenation errors

Errors were introduced in I763f79c6 and Id5fd7180.

Change-Id: Ieb5189636eb3df54290aaf998834988c81099eb3