OS X: Improve support back to 10.7