Fix a couple of problems with splitting by column