Add some asserts
Fix an issue with concat