diff --git a/autoload/airline/extensions/branch.vim b/autoload/airline/extensions/branch.vim
index e97cae85..6e82d664 100644
--- a/autoload/airline/extensions/branch.vim
+++ b/autoload/airline/extensions/branch.vim
@@ -107,6 +107,7 @@ function! s:check_in_path()
         if match(root, pattern) >= 0
           let root = substitute(root, pattern, '', '')
         endif
+      endif
     endif
 
     let b:airline_file_in_root = stridx(bufferpath, root) > -1
diff --git a/autoload/airline/extensions/tabline.vim b/autoload/airline/extensions/tabline.vim
index 5a65cc06..4681a2a4 100644
--- a/autoload/airline/extensions/tabline.vim
+++ b/autoload/airline/extensions/tabline.vim
@@ -1,6 +1,8 @@
 " MIT License. Copyright (c) 2013-2014 Bailey Ling.
 " vim: et ts=2 sts=2 sw=2
 
+scriptencoding utf-8
+
 let s:formatter = get(g:, 'airline#extensions#tabline#formatter', 'default')
 let s:excludes = get(g:, 'airline#extensions#tabline#excludes', [])
 let s:tab_nr_type = get(g:, 'airline#extensions#tabline#tab_nr_type', 0)
diff --git a/autoload/airline/extensions/tabline/unique_tail_improved.vim b/autoload/airline/extensions/tabline/unique_tail_improved.vim
index 3590fbb5..e96deeb2 100644
--- a/autoload/airline/extensions/tabline/unique_tail_improved.vim
+++ b/autoload/airline/extensions/tabline/unique_tail_improved.vim
@@ -1,6 +1,8 @@
 " MIT License. Copyright (c) 2013-2014 Bailey Ling.
 " vim: et ts=2 sts=2 sw=2
 
+scriptencoding utf-8
+
 let s:skip_symbol = '…'
 
 function! airline#extensions#tabline#unique_tail_improved#format(bufnr, buffers)
diff --git a/autoload/airline/extensions/whitespace.vim b/autoload/airline/extensions/whitespace.vim
index 86574129..f535e45e 100644
--- a/autoload/airline/extensions/whitespace.vim
+++ b/autoload/airline/extensions/whitespace.vim
@@ -67,7 +67,7 @@ function! airline#extensions#whitespace#check()
     endif
   endif
   return b:airline_whitespace_check
-endfunction!
+endfunction
 
 function! airline#extensions#whitespace#toggle()
   if s:enabled