Starting 10.8 fixes