diff --git a/pac4j-saml/src/main/java/org/pac4j/saml/client/SAML2Client.java b/pac4j-saml/src/main/java/org/pac4j/saml/client/SAML2Client.java
index 9f5b1a6424..55b28ccb18 100644
--- a/pac4j-saml/src/main/java/org/pac4j/saml/client/SAML2Client.java
+++ b/pac4j-saml/src/main/java/org/pac4j/saml/client/SAML2Client.java
@@ -10,8 +10,6 @@
 import org.opensaml.saml.saml2.core.Attribute;
 import org.opensaml.saml.saml2.core.AuthnRequest;
 import org.opensaml.saml.saml2.encryption.Decrypter;
-import org.pac4j.core.client.BaseClient;
-import org.pac4j.core.client.ClientType;
 import org.pac4j.core.client.IndirectClient;
 import org.pac4j.core.client.RedirectAction;
 import org.pac4j.core.context.WebContext;
@@ -72,7 +70,7 @@ public class SAML2Client extends IndirectClient<SAML2Credentials, SAML2Profile>
 
 	protected SignatureSigningParametersProvider signatureSigningParametersProvider;
 
-	protected SAML2ProfileHandler profileHandler;
+	protected SAML2ProfileHandler<AuthnRequest> profileHandler;
 
 	protected SAML2ResponseValidator responseValidator;
 
diff --git a/pac4j-saml/src/main/java/org/pac4j/saml/crypto/KeyStoreCredentialProvider.java b/pac4j-saml/src/main/java/org/pac4j/saml/crypto/KeyStoreCredentialProvider.java
index 9e1270799c..7b8b0b58f8 100644
--- a/pac4j-saml/src/main/java/org/pac4j/saml/crypto/KeyStoreCredentialProvider.java
+++ b/pac4j-saml/src/main/java/org/pac4j/saml/crypto/KeyStoreCredentialProvider.java
@@ -39,6 +39,8 @@
  */
 public class KeyStoreCredentialProvider implements CredentialProvider {
 
+	private static final String DEFAULT_KEYSTORE_TYPE = "JKS";
+
 	private final Logger logger = LoggerFactory.getLogger(KeyStoreCredentialProvider.class);
 
 	private final CredentialResolver credentialResolver;
@@ -46,7 +48,7 @@ public class KeyStoreCredentialProvider implements CredentialProvider {
 	private final String privateKey;
 
 	public KeyStoreCredentialProvider(final String name, final String storePasswd, final String privateKeyPasswd) {
-		this(null, null, "JKS", null, name, storePasswd, privateKeyPasswd);
+		this(null, null, DEFAULT_KEYSTORE_TYPE, null, name, storePasswd, privateKeyPasswd);
 	}
 
 	public KeyStoreCredentialProvider(final KeyStore keyStore, final String keyStoreAlias, String keyStoreType,
@@ -78,7 +80,7 @@ public KeyStoreCredentialProvider(final KeyStore keyStore, final String keyStore
 	}
 
 	public KeyStoreCredentialProvider(SAML2ClientConfiguration configuration) {
-		this(configuration.getKeyStore(), configuration.getKeyStoreAlias(), configuration.getKeyStoreType(),
+		this(configuration.getKeyStore(), configuration.getKeyStoreAlias(), (configuration.getKeyStoreType() == null ? DEFAULT_KEYSTORE_TYPE : configuration.getKeyStoreType()),
 				configuration.getKeystoreResource(), configuration.getKeystorePath(),
 				configuration.getKeystorePassword(), configuration.getPrivateKeyPassword());
 	}
diff --git a/pac4j-saml/src/main/java/org/pac4j/saml/sso/impl/SAML2DefaultResponseValidator.java b/pac4j-saml/src/main/java/org/pac4j/saml/sso/impl/SAML2DefaultResponseValidator.java
index a14c5b8327..943768881c 100644
--- a/pac4j-saml/src/main/java/org/pac4j/saml/sso/impl/SAML2DefaultResponseValidator.java
+++ b/pac4j-saml/src/main/java/org/pac4j/saml/sso/impl/SAML2DefaultResponseValidator.java
@@ -60,6 +60,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.google.common.annotations.VisibleForTesting;
+
 import net.shibboleth.utilities.java.support.net.BasicURLComparator;
 import net.shibboleth.utilities.java.support.net.URIComparator;
 import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
@@ -396,8 +398,7 @@ protected final void validateAssertion(final Assertion assertion, final SAML2Mes
 	 * @param decrypter
      *            Decrypter used to decrypt some encrypted IDs, if they are present. May be {@code null}, no decryption will be possible
 	 *            then.
-	 */
-    @SuppressWarnings("unchecked")
+	 */
 	protected final void validateSubject(final Subject subject, final SAML2MessageContext context,
 			final Decrypter decrypter) {
 		boolean samlIDFound = false;