fixes for OSX 10.10