Patches to make it work on 10.8.4