Fix some issues with concatenation