#559 fixes for 10.9