osx keyring fixes
osx packaging fixes