Updated to build with 10.7 above