Improved compatibility with OS X 10.8