Changes to support 10.8.4