Fixes for 10.7