More OS X 10.7 fixes