Fixes for 10.9