- OS X compilation fixes
- OS X compilation fixes