Index: src/OFDoubleMatrix.m
==================================================================
--- src/OFDoubleMatrix.m
+++ src/OFDoubleMatrix.m
@@ -177,11 +177,11 @@
 
 	data[row * columns + column] = value;
 }
 
 - (double)valueForRow: (size_t)row
-	      column: (size_t)column
+	       column: (size_t)column
 {
 	if (row >= rows || column >= columns)
 		@throw [OFOutOfRangeException newWithClass: isa];
 
 	return data[row * columns + column];

Index: src/OFString.h
==================================================================
--- src/OFString.h
+++ src/OFString.h
@@ -647,11 +647,11 @@
 
 /**
  * Splits an OFString into an OFArray of OFStrings.
  *
  * \param delimiter The delimiter for splitting
- * \return An autoreleased OFArray with the splitted string
+ * \return An autoreleased OFArray with the split string
  */
 - (OFArray*)componentsSeparatedByString: (OFString*)delimiter;
 
 /**
  * \return The components of the path

Index: src/objc_properties.m
==================================================================
--- src/objc_properties.m
+++ src/objc_properties.m
@@ -21,11 +21,11 @@
 #import "OFObject.h"
 
 #ifdef OF_THREADS
 # import "threading.h"
 # define NUM_SPINLOCKS 8	/* needs to be a power of 2 */
-# define SPINLOCK_HASH(p) ((uintptr_t)p >> 4) & (NUM_SPINLOCKS - 1)
+# define SPINLOCK_HASH(p) ((unsigned)((uintptr_t)p >> 4) & (NUM_SPINLOCKS - 1))
 static of_spinlock_t spinlocks[NUM_SPINLOCKS];
 #endif
 
 BOOL
 objc_properties_init(void)