Fixed several bugs in Split/Join