Edits for OSX