Keychain handling tweaks to fix possible 10.6 bug