* Fixes for dummy OS X