Fix return value for string
Fix concat for strings