diff --git a/zsh/.config/zsh/.zprofile b/zsh/.config/zsh/.zprofile
index cfcc021..d1de7ee 100644
--- a/zsh/.config/zsh/.zprofile
+++ b/zsh/.config/zsh/.zprofile
@@ -1,3 +1,3 @@
 # Set PATH, MANPATH, etc., for Homebrew.
-eval "$(/opt/homebrew/bin/brew shellenv)"
-eval "$(fnm env --use-on-cd)"
+[ -x `command -v brew` ] && eval "$(/opt/homebrew/bin/brew shellenv)"
+[ -x `command -v fnm` ] && eval "$(fnm env --use-on-cd)"
diff --git a/zsh/.config/zsh/.zshrc b/zsh/.config/zsh/.zshrc
index 7e2612a..cc03230 100644
--- a/zsh/.config/zsh/.zshrc
+++ b/zsh/.config/zsh/.zshrc
@@ -55,6 +55,9 @@ plugin-load $repos
 # FZF
 [ -f ~/.fzf.zsh ] && source ~/.fzf.zsh
 
+# Clean startup prompt
+! [ -f ~/.hushlogin ] && touch ~/.hushlogin
+
 compinit
 
 # Edit line in vim with ctrl-e:
diff --git a/zsh/.config/zsh/zsh-aliases b/zsh/.config/zsh/zsh-aliases
index b3cb1f4..f4085ae 100644
--- a/zsh/.config/zsh/zsh-aliases
+++ b/zsh/.config/zsh/zsh-aliases
@@ -1,6 +1,5 @@
 #!/bin/sh
 
 alias zsh-update-plugins="find "$ZDOTDIR/plugins" -type d -exec test -e '{}/.git' ';' -print0 | xargs -I {} -0 git -C {} pull -q"
-alias ls="lsd"
-alias cat="bat"
-alias pnpx="pnpm dlx"
+[ -x `command -v lsd` ] && alias ls="lsd"
+[ -x `command -v bat` ] && alias cat="bat"