diff --git a/core/src/main/java/org/springframework/ldap/odm/typeconversion/impl/ConverterManagerImpl.java b/core/src/main/java/org/springframework/ldap/odm/typeconversion/impl/ConverterManagerImpl.java
old mode 100755
new mode 100644
index 3df19e20e..c6a8dace7
--- a/core/src/main/java/org/springframework/ldap/odm/typeconversion/impl/ConverterManagerImpl.java
+++ b/core/src/main/java/org/springframework/ldap/odm/typeconversion/impl/ConverterManagerImpl.java
@@ -127,7 +127,7 @@ public boolean canConvert(Class<?> fromClass, String syntax, Class<?> toClass) {
 	public <T> T convert(Object source, String syntax, Class<T> toClass) {
 		Object result = null;
 
-		// What are we converting form
+		// What are we converting from
 		Class<?> fromClass = source.getClass();
 
 		// Deal with primitives
diff --git a/test/integration-tests/src/test/java/org/apache/directory/server/core/avltree/ArrayMarshaller.java b/test/integration-tests/src/test/java/org/apache/directory/server/core/avltree/ArrayMarshaller.java
index cdaa9d5fc..42f05560b 100644
--- a/test/integration-tests/src/test/java/org/apache/directory/server/core/avltree/ArrayMarshaller.java
+++ b/test/integration-tests/src/test/java/org/apache/directory/server/core/avltree/ArrayMarshaller.java
@@ -61,7 +61,7 @@ public ArrayMarshaller(Comparator<E> comparator, Marshaller<E> keyMarshaller) {
 	/**
 	 * Creates a new instance of AvlTreeMarshaller with the default key Marshaller which
 	 * uses Java Serialization.
-	 * @param comparator Comparator to be used for key comparision
+	 * @param comparator Comparator to be used for key comparison
 	 */
 	public ArrayMarshaller(Comparator<E> comparator) {
 		this.comparator = comparator;