diff --git a/shell-integration/ssh/bootstrap.sh b/shell-integration/ssh/bootstrap.sh
index 44a688c5c..18966988b 100644
--- a/shell-integration/ssh/bootstrap.sh
+++ b/shell-integration/ssh/bootstrap.sh
@@ -203,7 +203,7 @@ parse_passwd_record() {
 using_getent() {
     cmd=$(command -v getent)
     if [ -n "$cmd" ]; then
-        output=$($cmd passwd $USER 2>/dev/null)
+        output=$(command $cmd passwd $USER 2>/dev/null)
         if [ $? = 0 ]; then
             login_shell=$(echo $output | parse_passwd_record);
             if login_shell_is_ok; then return 0; fi
@@ -215,7 +215,7 @@ using_getent() {
 using_id() {
     cmd=$(command -v id)
     if [ -n "$cmd" ]; then
-        output=$($cmd -P $USER 2>/dev/null)
+        output=$(command $cmd -P $USER 2>/dev/null)
         if [ $? = 0 ]; then
             login_shell=$(echo $output | parse_passwd_record);
             if login_shell_is_ok; then return 0; fi
diff --git a/shell-integration/zsh/kitty-integration b/shell-integration/zsh/kitty-integration
index a2d615547..6b37a0876 100644
--- a/shell-integration/zsh/kitty-integration
+++ b/shell-integration/zsh/kitty-integration
@@ -55,9 +55,9 @@ builtin typeset -gi _ksi_state
 #   _ksi_deferred_init.
 typeset -gi _ksi_fd
 {
-    zmodload zsh/system && (( $+builtins[sysopen] )) && {
-        { [[ -w     $TTY ]] && sysopen -o cloexec -wu _ksi_fd --     $TTY } ||
-        { [[ -w /dev/tty ]] && sysopen -o cloexec -wu _ksi_fd -- /dev/tty }
+    builtin zmodload zsh/system && (( $+builtins[sysopen] )) && {
+        { [[ -w     $TTY ]] && builtin sysopen -o cloexec -wu _ksi_fd --     $TTY } ||
+        { [[ -w /dev/tty ]] && builtin sysopen -o cloexec -wu _ksi_fd -- /dev/tty }
     }
 } 2>/dev/null || (( _ksi_fd = 1 ))
 
@@ -87,7 +87,7 @@ _ksi_deferred_init() {
     # Recognized options: no-cursor, no-title, no-prompt-mark, no-complete.
     builtin local -a opt
     opt=(${(s: :)KITTY_SHELL_INTEGRATION})
-    unset KITTY_SHELL_INTEGRATION
+    builtin unset KITTY_SHELL_INTEGRATION
 
     # The directory where kitty-integration is located: /.../shell-integration/zsh.
     builtin local self_dir="${functions_source[_ksi_deferred_init]:A:h}"