More OS X fixes