Make tools work on Mac, etc