Basic OS X compilation changes.  Still does not link