diff --git a/autoload/jedi.vim b/autoload/jedi.vim
index 201a8e3..1d6cb9f 100644
--- a/autoload/jedi.vim
+++ b/autoload/jedi.vim
@@ -197,7 +197,6 @@ endfunction
 " ------------------------------------------------------------------------
 " deprecations
 " ------------------------------------------------------------------------
-
 let s:deprecations = {
     \ 'get_definition_command':     'goto_definitions_command',
     \ 'goto_command':               'goto_assignments_command',
@@ -207,18 +206,9 @@ let s:deprecations = {
     \ 'show_function_definition':   'show_call_signatures',
 \ }
 
-for [key, val] in items(s:deprecations)
-    if exists('g:jedi#'.key)
-        echom "'g:jedi#".key."' is deprecated. Please use 'g:jedi#".val."' instead. Sorry for the inconvenience."
-        exe 'let g:jedi#'.val.' = g:jedi#'.key
-    end
-endfor
-
-
 " ------------------------------------------------------------------------
 " defaults for jedi-vim
 " ------------------------------------------------------------------------
-
 let s:settings = {
     \ 'use_tabs_not_buffers': 1,
     \ 'use_splits_not_buffers': 1,
@@ -240,12 +230,21 @@ let s:settings = {
     \ 'completions_enabled': 1
 \ }
 
-for [key, val] in items(s:settings)
-    if !exists('g:jedi#'.key)
-        exe 'let g:jedi#'.key.' = '.val
-    endif
-endfor
+function! s:init()
+  for [key, val] in items(s:deprecations)
+      if exists('g:jedi#'.key)
+          echom "'g:jedi#".key."' is deprecated. Please use 'g:jedi#".val."' instead. Sorry for the inconvenience."
+          exe 'let g:jedi#'.val.' = g:jedi#'.key
+      end
+  endfor
+  for [key, val] in items(s:settings)
+      if !exists('g:jedi#'.key)
+          exe 'let g:jedi#'.key.' = '.val
+      endif
+  endfor
+endfunction
 
+call s:init()
 
 " ------------------------------------------------------------------------
 " Python initialization
diff --git a/ftplugin/python/jedi.vim b/ftplugin/python/jedi.vim
index 1260487..938b10c 100644
--- a/ftplugin/python/jedi.vim
+++ b/ftplugin/python/jedi.vim
@@ -8,17 +8,17 @@ endif
 if g:jedi#auto_initialization
     " goto / get_definition / usages
     if g:jedi#goto_assignments_command != ''
-        execute "noremap <buffer>".g:jedi#goto_assignments_command." :call jedi#goto_assignments()<CR>"
+        execute "nnoremap <buffer> ".g:jedi#goto_assignments_command." :call jedi#goto_assignments()<CR>"
     endif
     if g:jedi#goto_definitions_command != ''
-        execute "noremap <buffer>".g:jedi#goto_definitions_command." :call jedi#goto_definitions()<CR>"
+        execute "nnoremap <buffer> ".g:jedi#goto_definitions_command." :call jedi#goto_definitions()<CR>"
     endif
     if g:jedi#usages_command != ''
-        execute "noremap <buffer>".g:jedi#usages_command." :call jedi#usages()<CR>"
+        execute "nnoremap <buffer> ".g:jedi#usages_command." :call jedi#usages()<CR>"
     endif
     " rename
     if g:jedi#rename_command != ''
-        execute "noremap <buffer>".g:jedi#rename_command." :call jedi#rename()<CR>"
+        execute "nnoremap <buffer> ".g:jedi#rename_command." :call jedi#rename()<CR>"
     endif
     " documentation/pydoc
     if g:jedi#documentation_command != ''