[Line Number] many fixes #2861