* More OS X fixes