Updating OSX and Windows builds