Changes to enable support for 10.8