diff --git a/nvim/init.vim b/nvim/init.vim
index 6060c03..c7df111 100644
--- a/nvim/init.vim
+++ b/nvim/init.vim
@@ -93,6 +93,7 @@ let g:startify_list_order = [
 let g:python3_host_prog = '/usr/bin/python3'
 
 " Neomake
+let g:neomake_python_exe = '/usr/bin/python3'
 let g:neomake_python_enabled_makers = ['flake8', 'mypy']
 autocmd! BufWritePost * Neomake
 
diff --git a/setup.sh b/setup.sh
index c08e813..1454a4e 100644
--- a/setup.sh
+++ b/setup.sh
@@ -5,6 +5,12 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 APT=`command -v apt`
 DNF=`command -v dnf`
 
+function update_pkg_repos() {
+    if [[ -n "$APT" ]]; then
+        sudo apt update
+    fi
+}
+
 function check_or_install() {
     CMD=`command -v $1`
     PKG=$2
@@ -102,6 +108,7 @@ function setup_topydo() {
 # Set up a generic bin directory for scripts and tools
 mkdir -p $HOME/bin
 mkdir -p $HOME/.config
+update_pkg_repos
 install_build_tools
 setup_neovim
 setup_git