Fixed stuff for osx