More tweaking for osx