Fix various issues with split/combine by column