Keychain fixes