Fixing KeyStore method calls