Added some OSX changes