Fixed stuff on OSX