Tweaks to switch usage to using ZSH