Fix 10.7 and 10.8 support.