Further OS X port modifications