Updated general and keychain plugin.