Disable current line highlight
Some fixes
Small fix
Small fix