OS X: Miscellaneous fixes (close #115)