Fixed string concatentation issues