keychain fixes