Small fixes for 10.6/10.7 deployment