Some more fixes to new zsh config layout.