Fix issues mac os yosemite