Fixes for Mac OSX 10.10 (#2635)

As stated in issue #2635