diff --git a/src/main/java/org/springframework/data/couchbase/core/convert/BooleanToEnumConverterFactory.java b/src/main/java/org/springframework/data/couchbase/core/convert/BooleanToEnumConverterFactory.java
index a86c3c2c6..82ebee455 100644
--- a/src/main/java/org/springframework/data/couchbase/core/convert/BooleanToEnumConverterFactory.java
+++ b/src/main/java/org/springframework/data/couchbase/core/convert/BooleanToEnumConverterFactory.java
@@ -29,7 +29,7 @@
 /**
  * Reading Converter factory for Enums. This differs from the one provided in org.springframework.core.convert.support
  * by getting the result from the jackson objectmapper (which will process @JsonValue annotations) This is registered in
- * {@link org.springframework.data.couchbase.config.AbstractCouchbaseConfiguration#customConversions(CryptoManager)}.
+ * {@link org.springframework.data.couchbase.config.AbstractCouchbaseConfiguration#customConversions(CryptoManager, ObjectMapper)}.
  *
  * @author Michael Reiche
  */
diff --git a/src/main/java/org/springframework/data/couchbase/core/convert/CouchbasePropertyValueConverterFactory.java b/src/main/java/org/springframework/data/couchbase/core/convert/CouchbasePropertyValueConverterFactory.java
index 91f979211..de386528d 100644
--- a/src/main/java/org/springframework/data/couchbase/core/convert/CouchbasePropertyValueConverterFactory.java
+++ b/src/main/java/org/springframework/data/couchbase/core/convert/CouchbasePropertyValueConverterFactory.java
@@ -38,7 +38,7 @@
  * There can only be one propertyValueConverter for a property. Although there maybe be multiple annotations,
  * getConverter(property) only returns one converter (a ChainedPropertyValueConverter might be useful). Note that
  * valueConversions.afterPropertiesSet() (see
- * {@link org.springframework.data.couchbase.config.AbstractCouchbaseConfiguration#customConversions(CryptoManager)}
+ * {@link org.springframework.data.couchbase.config.AbstractCouchbaseConfiguration#customConversions(CryptoManager, ObjectMapper)}
  * encapsulates this in a CachingPropertyValueConverterFactory which caches by 'property'. Although
  * CachingPropertyValueConverterFactory does have the functionality to cache by a type, it only caches by the type
  * specified on an @ValueConverter annotation.To avoid having identical converter instances for each instance of a class
diff --git a/src/main/java/org/springframework/data/couchbase/core/convert/IntegerToEnumConverterFactory.java b/src/main/java/org/springframework/data/couchbase/core/convert/IntegerToEnumConverterFactory.java
index 92373ccd5..4f934de13 100644
--- a/src/main/java/org/springframework/data/couchbase/core/convert/IntegerToEnumConverterFactory.java
+++ b/src/main/java/org/springframework/data/couchbase/core/convert/IntegerToEnumConverterFactory.java
@@ -29,7 +29,7 @@
 /**
  * Reading Converter factory for Enums. This differs from the one provided in org.springframework.core.convert.support
  * by getting the result from the jackson objectmapper (which will process @JsonValue annotations) This is registered in
- * {@link org.springframework.data.couchbase.config.AbstractCouchbaseConfiguration#customConversions(CryptoManager)}.
+ * {@link org.springframework.data.couchbase.config.AbstractCouchbaseConfiguration#customConversions(CryptoManager, ObjectMapper)}.
  * This will take precedence over {@link org.springframework.core.convert.support.IntegerToEnumConverterFactory}
  *
  * @author Michael Reiche
diff --git a/src/main/java/org/springframework/data/couchbase/core/convert/MappingCouchbaseConverter.java b/src/main/java/org/springframework/data/couchbase/core/convert/MappingCouchbaseConverter.java
index 8e405c9ce..9fd100d89 100644
--- a/src/main/java/org/springframework/data/couchbase/core/convert/MappingCouchbaseConverter.java
+++ b/src/main/java/org/springframework/data/couchbase/core/convert/MappingCouchbaseConverter.java
@@ -869,7 +869,7 @@ public Object getPotentiallyConvertedSimpleWrite(final CouchbasePersistentProper
 	/**
 	 * This does process PropertyValueConversions
 	 *
-	 * @param value
+	 * @param property
 	 * @param accessor
 	 * @param processValueConverter
 	 * @return
diff --git a/src/main/java/org/springframework/data/couchbase/core/convert/StringToEnumConverterFactory.java b/src/main/java/org/springframework/data/couchbase/core/convert/StringToEnumConverterFactory.java
index 756e80ec1..d5f7087b5 100644
--- a/src/main/java/org/springframework/data/couchbase/core/convert/StringToEnumConverterFactory.java
+++ b/src/main/java/org/springframework/data/couchbase/core/convert/StringToEnumConverterFactory.java
@@ -27,7 +27,7 @@
 /**
  * Reading Converter factory for Enums. This differs from the one provided in org.springframework.core.convert.support
  * by getting the result from the jackson objectmapper (which will process @JsonValue annotations) This is registered in
- * {@link org.springframework.data.couchbase.config.AbstractCouchbaseConfiguration#customConversions(CryptoManager)}.
+ * {@link org.springframework.data.couchbase.config.AbstractCouchbaseConfiguration#customConversions(CryptoManager, ObjectMapper)}.
  * This will take precedence over {@link org.springframework.core.convert.support.StringToEnumConverterFactory}
  * 
  * @author Michael Reiche