diff --git a/spring-vault-core/src/main/java/org/springframework/vault/core/VaultOperations.java b/spring-vault-core/src/main/java/org/springframework/vault/core/VaultOperations.java
index 404209d4..60d2e556 100644
--- a/spring-vault-core/src/main/java/org/springframework/vault/core/VaultOperations.java
+++ b/spring-vault-core/src/main/java/org/springframework/vault/core/VaultOperations.java
@@ -35,9 +35,10 @@ import org.springframework.vault.support.VaultResponseSupport;
  * <p>
  * {@link VaultOperations} resolves {@link VaultClient} instances and allows execution of
  * callback methods on various levels. Callbacks can execute requests within a
- * {@link #doWithVault(SessionCallback) session}, the {@link #doWithVault(ClientCallback)
- * client (without requiring a session)} and a
- * {@link #doWithRestTemplate(String, Map, RestTemplateCallback) low-level}
+ * {@link VaultOperations#doWithVault(SessionCallback) session}, the
+ * {@link VaultOperations#doWithVault(ClientCallback) client (without requiring a
+ * session)} and a
+ * {@link VaultOperations#doWithRestTemplate(String, Map, RestTemplateCallback) low-level}
  * {@link org.springframework.web.client.RestTemplate} level.
  *
  * @author Mark Paluch
diff --git a/spring-vault-core/src/main/java/org/springframework/vault/support/JsonMapFlattener.java b/spring-vault-core/src/main/java/org/springframework/vault/support/JsonMapFlattener.java
index e8c6558a..d516b483 100644
--- a/spring-vault-core/src/main/java/org/springframework/vault/support/JsonMapFlattener.java
+++ b/spring-vault-core/src/main/java/org/springframework/vault/support/JsonMapFlattener.java
@@ -42,7 +42,7 @@ import org.springframework.util.StringUtils;
  * </code>
  * </pre>
  * 
- * <br/>
+ * <br>
  * Result
  * 
  * <pre>
diff --git a/spring-vault-core/src/main/java/org/springframework/vault/support/SslConfiguration.java b/spring-vault-core/src/main/java/org/springframework/vault/support/SslConfiguration.java
index b5cf6186..5cd4f89e 100644
--- a/spring-vault-core/src/main/java/org/springframework/vault/support/SslConfiguration.java
+++ b/spring-vault-core/src/main/java/org/springframework/vault/support/SslConfiguration.java
@@ -62,10 +62,10 @@ public class SslConfiguration {
 	/**
 	 * Creates a new {@link SslConfiguration}.
 	 *
-	 * @param keyStore
-	 * @param keyStorePassword
-	 * @param trustStore
-	 * @param trustStorePassword
+	 * @param keyStore the keystore resource.
+	 * @param keyStorePassword the keystore password.
+	 * @param trustStore the truststore resource.
+	 * @param trustStorePassword the truststore password.
 	 */
 	public SslConfiguration(Resource keyStore, String keyStorePassword,
 			Resource trustStore, String trustStorePassword) {
diff --git a/spring-vault-core/src/main/java/org/springframework/vault/support/VaultInitializationRequest.java b/spring-vault-core/src/main/java/org/springframework/vault/support/VaultInitializationRequest.java
index a76e1116..7bc161f2 100644
--- a/spring-vault-core/src/main/java/org/springframework/vault/support/VaultInitializationRequest.java
+++ b/spring-vault-core/src/main/java/org/springframework/vault/support/VaultInitializationRequest.java
@@ -39,8 +39,8 @@ public class VaultInitializationRequest {
 	 * Create a new {@literal VaultInitializationRequest} given {@code secretShares} and
 	 * {@code secretThreshold}.
 	 * 
-	 * @param secretShares
-	 * @param secretThreshold
+	 * @param secretShares number of key shares.
+	 * @param secretThreshold number of required keys for unsealing.
 	 * @return a new {@link VaultInitializationRequest}.
 	 */
 	public static VaultInitializationRequest create(int secretShares, int secretThreshold) {