Fix column counts