Some changes for OS X and iTerm2