diff --git a/packages/memcached/build.sh b/packages/memcached/build.sh
index 33268ee0f..ee4290874 100644
--- a/packages/memcached/build.sh
+++ b/packages/memcached/build.sh
@@ -15,7 +15,7 @@ termux_step_pre_configure() {
 
 	export ac_cv_c_endian=little
 
-	# fix SASL configuration path
+	# Fix SASL configuration path
 	perl -p -i -e "s#/etc/sasl#$TERMUX_PREFIX/etc/sasl#" $TERMUX_PKG_BUILDDIR/sasl_defs.c
 
 	# getsubopt() taken from https://github.com/lxc/lxc/blob/master/src/include/getsubopt.c
diff --git a/packages/valac/build.sh b/packages/valac/build.sh
index cbb0448cb..7846bbcfd 100644
--- a/packages/valac/build.sh
+++ b/packages/valac/build.sh
@@ -10,6 +10,6 @@ TERMUX_PKG_REPLACES="valac-dev"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--with-cgraph=no"
 
 termux_step_post_make_install() {
-	cd $TERMUX_PREFIX/lib
+	cd ${TERMUX_PREFIX}/lib
 	ln -s -f vala-${TERMUX_PKG_VERSION:0:4}/libvalaccodegen.so libvalaccodegen.so
 }
diff --git a/packages/vim-python/build.sh b/packages/vim-python/build.sh
index 407ff03cc..74361d85e 100644
--- a/packages/vim-python/build.sh
+++ b/packages/vim-python/build.sh
@@ -5,9 +5,9 @@ TERMUX_PKG_DEPENDS="libiconv, ncurses, vim-runtime, python"
 TERMUX_PKG_RECOMMENDS="diffutils"
 # vim should only be updated every 50 releases on multiples of 50.
 # Update both vim and vim-python to the same version in one PR.
-TERMUX_PKG_VERSION=8.2.1550
+TERMUX_PKG_VERSION=8.2.1600
 TERMUX_PKG_SRCURL="https://github.com/vim/vim/archive/v${TERMUX_PKG_VERSION}.tar.gz"
-TERMUX_PKG_SHA256=b6d40e2371bc8e8bc40fdf62c22985356ccc30c568fb8215fa7cad3e46d54b5c
+TERMUX_PKG_SHA256=f684ec030f2189a3a021a19aea76be7eded196550cb6bff1bb8e8f57720fd592
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 vim_cv_getcwd_broken=no
 vim_cv_memmove_handles_overlap=yes
diff --git a/packages/vim/build.sh b/packages/vim/build.sh
index c2635cfb6..a008c92ea 100644
--- a/packages/vim/build.sh
+++ b/packages/vim/build.sh
@@ -5,9 +5,9 @@ TERMUX_PKG_DEPENDS="libiconv, ncurses, vim-runtime"
 TERMUX_PKG_RECOMMENDS="diffutils"
 # vim should only be updated every 50 releases on multiples of 50.
 # Update both vim and vim-python to the same version in one PR.
-TERMUX_PKG_VERSION=8.2.1550
+TERMUX_PKG_VERSION=8.2.1600
 TERMUX_PKG_SRCURL="https://github.com/vim/vim/archive/v${TERMUX_PKG_VERSION}.tar.gz"
-TERMUX_PKG_SHA256=b6d40e2371bc8e8bc40fdf62c22985356ccc30c568fb8215fa7cad3e46d54b5c
+TERMUX_PKG_SHA256=f684ec030f2189a3a021a19aea76be7eded196550cb6bff1bb8e8f57720fd592
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 vim_cv_getcwd_broken=no
 vim_cv_memmove_handles_overlap=yes