Fix bug, move mac specific code to mac.zsh