Fixes for 10.6
Fixes for 10.6