Fixed dumb splits

Some splitting (and joining) have being used in a sub-optimal way.