Fixed os 10.9 issues