Imporving support for 10.9