FIX: Minor fixes

I snuck in some concatenation fixes that I've been meaning to add. Ready for review/merge.