(guy) Fix some problems with OSX