Fixed problems found on join and split primitives