Updates for non-bash shells