More Mac OS X fixes