Fixed keychain initialization