Added osx stuff