- Fixes for OSX