diff --git a/contrib/cronjob b/contrib/cronjob
old mode 100644
new mode 100755
diff --git a/guest/fs-root/etc/profile.d/segfault.sh b/guest/fs-root/etc/profile.d/segfault.sh
index 0a50638..3fd999a 100644
--- a/guest/fs-root/etc/profile.d/segfault.sh
+++ b/guest/fs-root/etc/profile.d/segfault.sh
@@ -16,11 +16,8 @@ unset _IS_SHOW_MOTD
 unset SF_IS_NEW_SERVER
 unset SF_IS_LOGINSHELL
 
-[[ -n $BASH ]] && {
-	# user on zsh and did `bash -il`
-	export SHELL="/bin/bash"
-}
-
+# user on zsh and did `bash`
+[[ -n $BASH ]] && export SHELL="/bin/bash"
 [[ -n $ZSH_NAME ]] && {
 	# user on bash and did `zsh -il`
 	export SHELL="/bin/zsh"
diff --git a/guest/fs-root/etc/shellrc b/guest/fs-root/etc/shellrc
index caa99d9..7d5ff44 100644
--- a/guest/fs-root/etc/shellrc
+++ b/guest/fs-root/etc/shellrc
@@ -1,5 +1,6 @@
 ### Sourced as the last entry from ~/.zshrc or ~/.bashrc
 
+[[ -n $BASH ]] && export SHELL="/bin/bash" # user on zsh and did `bash`
 # shellcheck disable=SC1091
 source "/sf/bin/funcs.sh" 2>/dev/null
 
@@ -272,4 +273,4 @@ apt-get()
 
 SHELLNAME="${SHELL##*/}"
 [[ -f "${HOME}/.gf/gf-completion.${SHELLNAME}" ]] && source "${HOME}/.gf/gf-completion.${SHELLNAME}"
-unset SHELLNAME
\ No newline at end of file
+unset SHELLNAME
diff --git a/sfbin/sf b/sfbin/sf
index 99c9472..278dfa9 100755
--- a/sfbin/sf
+++ b/sfbin/sf
@@ -148,15 +148,9 @@ load_env
 	echo -e "Try \`curl 'https://www.dan.me.uk/torlist/?exit' >'${SF_DATADIR}/share/tor-exit-nodes.txt'\`"
 }
 
-[[ ! -f "${SF_DATADIR}/share/relay-exit-nodes-mullvad.txt" ]] && {
-	WARN 'Not found: data/share/relay-exit-nodes-mullvad.txt'
-	echo -e "See contrib/cronjob how to create it."
-}
+[[ ! -f "${SF_DATADIR}/share/relay-exit-nodes-mullvad.txt" ]] && WARN "Not found: data/share/relay-exit-nodes-mullvad.txt - ${CDM}See contrib/cronjob how to create it.${CN}"
 
-[[ ! -f "${SF_DATADIR}/share/proxies.txt" ]] && {
-	WARN 'Not found: data/share/proxies.txt'
-	echo -e "See contrib/cronjob how to create it."
-}
+[[ ! -f "${SF_DATADIR}/share/proxies.txt" ]] && WARN "Not found: data/share/proxies.txt - ${CDM}See contrib/cronjob how to create it.${CN}"
 
 [[ ! -f "${SF_BASEDIR}/config/etc/relay-exit-nodes-global.txt" ]] && {
 	WARN "Not found: ${SF_BASEDIR}/config/etc/relay-exit-nodes-global.txt"