More OS X fixes.