Index: src/OFSystemInfo.h
==================================================================
--- src/OFSystemInfo.h
+++ src/OFSystemInfo.h
@@ -28,18 +28,18 @@
  *
  * Possible keys are:
  *
  *   * @ref OFNetworkInterfaceAddresses
  */
-typedef OFString *OFNetworkInterfaceInfoKey;
+typedef OFConstantString *OFNetworkInterfaceInfoKey;
 
 /**
  * @brief The addresses of a network interface.
  *
  * This maps to an @ref OFData of @ref OFSocketAddress.
  */
-extern const OFConstantString *OFNetworkInterfaceAddresses;
+extern OFConstantString *const OFNetworkInterfaceAddresses;
 #endif
 
 /**
  * @class OFSystemInfo OFSystemInfo.h ObjFW/OFSystemInfo.h
  *

Index: src/OFSystemInfo.m
==================================================================
--- src/OFSystemInfo.m
+++ src/OFSystemInfo.m
@@ -120,11 +120,11 @@
 	uint32_t eax, ebx, ecx, edx;
 };
 #endif
 
 #if defined(OF_HAVE_SOCKETS) && defined(OF_HAVE_GETIFADDRS)
-const OFConstantString *OFNetworkInterfaceAddresses =
+OFConstantString *const OFNetworkInterfaceAddresses =
     @"OFNetworkInterfaceAddresses";
 #endif
 
 static size_t pageSize = 4096;
 static size_t numberOfCPUs = 1;

Index: src/exceptions/OFGetOptionFailedException.m
==================================================================
--- src/exceptions/OFGetOptionFailedException.m
+++ src/exceptions/OFGetOptionFailedException.m
@@ -59,8 +59,8 @@
 		return [OFString stringWithFormat:
 		    @"Getting an option in an object of type %@ failed: %@",
 		    [_object class], OFStrError(_errNo)];
 	else
 		return [OFString stringWithFormat:
-		    @"Getting an failed: %@", OFStrError(_errNo)];
+		    @"Getting an option failed: %@", OFStrError(_errNo)];
 }
 @end