Fix string concat so its safe.