Redo line/col fixes