diff --git a/autoload/airline.vim b/autoload/airline.vim
index 6047d0f9..6db2eaed 100644
--- a/autoload/airline.vim
+++ b/autoload/airline.vim
@@ -88,10 +88,12 @@ function! s:apply_window_overrides()
 endfunction
 
 function! airline#update_externals()
-  let g:airline_externals_bufferline = g:airline_enable_bufferline && exists('g:bufferline_loaded') ? '%{bufferline#generate_string()}' : "%f%m"
-  let g:airline_externals_syntastic = g:airline_enable_syntastic && exists('g:loaded_syntastic_plugin') ? '%{SyntasticStatuslineFlag()}' : ''
-  let g:airline_externals_fugitive = g:airline_enable_fugitive ? (exists('g:loaded_fugitive') && strlen(fugitive#head()) > 0
-        \ ? g:airline_fugitive_prefix.fugitive#head() : exists('g:loaded_lawrencium') && strlen(lawrencium#statusline()) > 0
+  let g:airline_externals_bufferline = g:airline_enable_bufferline && exists('*bufferline#get_status_string')
+        \ ? '%{bufferline#refresh_status()}'.bufferline#get_status_string()
+        \ : "%f%m"
+  let g:airline_externals_syntastic = g:airline_enable_syntastic && exists('*SyntasticStatuslineFlag') ? '%{SyntasticStatuslineFlag()}' : ''
+  let g:airline_externals_fugitive = g:airline_enable_fugitive ? (exists('*fugitive#head') && strlen(fugitive#head()) > 0
+        \ ? g:airline_fugitive_prefix.fugitive#head() : exists('*lawrencium#statusline') && strlen(lawrencium#statusline()) > 0
         \ ? g:airline_fugitive_prefix.lawrencium#statusline() : '') : ''
 endfunction