Max OS X fixes

These changes are from Brett, although I did modify them some.
2 files changed