Minor changes required for Mac OSX10.10 (Yosemite)