diff --git a/core/plugins.yaml b/core/plugins.yaml
index 544418d0..ce54861e 100644
--- a/core/plugins.yaml
+++ b/core/plugins.yaml
@@ -13,7 +13,7 @@
     let g:spaceline_seperate_style= 'slant-cons'
     let g:spaceline_git_branch_icon= ''
 
-- repo: hardcoreplayers/vim-buffet
+- repo: bagrat/vim-buffet
 
 - repo: glepnir/dashboard-nvim
   hook_add: source  $VIM_PATH/modules/module-dashboard.vim
diff --git a/lang/go.yaml b/lang/go.yaml
index 125eba4c..44fd732e 100644
--- a/lang/go.yaml
+++ b/lang/go.yaml
@@ -1,4 +1,4 @@
 
 # Go support
 # LanguageServerProtocol used by gopls
-- { repo: hardcoreplayers/go-nvim,on_ft: [ go, gomod ]}
+- { repo: fatih/vim-go,on_ft: [ go, gomod ]}
diff --git a/lang/sql.yaml b/lang/sql.yaml
index d96e83d7..57660f90 100644
--- a/lang/sql.yaml
+++ b/lang/sql.yaml
@@ -1,3 +1,3 @@
 
 # Sql support
-- { repo: hardcoreplayers/sql.vim, on_ft: sql }
+- { repo: shmup/vim-sql-syntax, on_ft: sql }
diff --git a/modules/module-lsp.vim b/modules/module-lsp.vim
index 8e91ed71..5a95f752 100644
--- a/modules/module-lsp.vim
+++ b/modules/module-lsp.vim
@@ -1,5 +1,5 @@
 " Gopls config
-if dein#tap('go-nvim')
+if dein#tap('vim-go')
   autocmd FileType go LSP 'go'
 endif
 
@@ -85,6 +85,6 @@ if dein#tap('dart-vim-plugin')
   call coc#add_extension('coc-flutter')
 endif
 
-if dein#tap('sql.vim')
+if dein#tap('vim-sql-syntax')
   call coc#add_extension('coc-sql')
 endif
diff --git a/scripts/pynvim.sh b/scripts/pynvim.sh
index 7b9d964e..a2e0709b 100644
--- a/scripts/pynvim.sh
+++ b/scripts/pynvim.sh
@@ -47,6 +47,7 @@ Install_Pynvim() {
 		warn "Delete '${__venv}' (or backup!) first, and then run ${0} again."
 	elif _try_pyenv || _try_python; then
 		# Install Python 3 requirements
+        "${__venv}/bin/pip" install -U wheel
 		"${__venv}/bin/pip" install -U pynvim PyYAML Send2Trash
 		ok '===> success'
 	else