Fix keychain inheritance