fixes for OSX Yosemite