started fixes for osx