diff --git a/autoload/ale/cursor.vim b/autoload/ale/cursor.vim
index eaa466b2..71112b1a 100644
--- a/autoload/ale/cursor.vim
+++ b/autoload/ale/cursor.vim
@@ -110,10 +110,3 @@ function! ale#cursor#EchoCursorWarningWithDelay() abort
 
     let s:cursor_timer = timer_start(10, function('ale#cursor#EchoCursorWarning'))
 endfunction
-
-if g:ale_has_required_features && g:ale_echo_cursor
-    augroup ALECursorGroup
-        autocmd!
-        autocmd CursorMoved,CursorHold * call ale#cursor#EchoCursorWarningWithDelay()
-    augroup END
-endif
diff --git a/autoload/ale/engine.vim b/autoload/ale/engine.vim
index 3d7374c6..b9a9ff9d 100644
--- a/autoload/ale/engine.vim
+++ b/autoload/ale/engine.vim
@@ -83,6 +83,10 @@ function! s:HandleExit(job) abort
     " Make some adjustments to the loclists to fix common problems.
     call s:FixLocList(buffer, linter_loclist)
 
+    for item in linter_loclist
+        let item.linter_name = linter.name
+    endfor
+
     if g:ale_buffer_should_reset_map[buffer]
         let g:ale_buffer_should_reset_map[buffer] = 0
         let g:ale_buffer_loclist_map[buffer] = []
diff --git a/plugin/ale.vim b/plugin/ale.vim
index 3982ee69..c7096dbc 100644
--- a/plugin/ale.vim
+++ b/plugin/ale.vim
@@ -105,6 +105,13 @@ let g:ale_buffer_loclist_map = {}
 let g:ale_buffer_should_reset_map = {}
 let g:ale_buffer_sign_dummy_map = {}
 
+if g:ale_echo_cursor
+    augroup ALECursorGroup
+        autocmd!
+        autocmd CursorMoved,CursorHold * call ale#cursor#EchoCursorWarningWithDelay()
+    augroup END
+endif
+
 " Backwards compatibility
 function! ALELint(delay)
     call ale#Queue(a:delay)