More line number related tweaks