Changes to add support for Mac OS X 10.7