Linking changes for OSX