fix the osx bugs
Merge branch 'osx'