diff --git a/src/SSLSocket.m b/src/SSLSocket.m
index cf0d055..e51c121 100644
--- a/src/SSLSocket.m
+++ b/src/SSLSocket.m
@@ -144,10 +144,10 @@ locking_callback(int mode, int n, const char *file, int line)
 		SSL_set_connect_state(ssl);
 
 		if ((privateKeyFile != nil && !SSL_use_PrivateKey_file(ssl,
-		    [privateKeyFile cStringWithEncoding:
+		    [privateKeyFile cStringUsingEncoding:
 		    OF_STRING_ENCODING_NATIVE], SSL_FILETYPE_PEM)) ||
 		    (certificateFile != nil && !SSL_use_certificate_file(ssl,
-		    [certificateFile cStringWithEncoding:
+		    [certificateFile cStringUsingEncoding:
 		    OF_STRING_ENCODING_NATIVE], SSL_FILETYPE_PEM)) ||
 		    SSL_connect(ssl) != 1) {
 			close(sock);
@@ -194,10 +194,10 @@ locking_callback(int mode, int n, const char *file, int line)
 	SSL_set_connect_state(ssl);
 
 	if ((privateKeyFile != nil && !SSL_use_PrivateKey_file(ssl,
-	    [privateKeyFile cStringWithEncoding: OF_STRING_ENCODING_NATIVE],
+	    [privateKeyFile cStringUsingEncoding: OF_STRING_ENCODING_NATIVE],
 	    SSL_FILETYPE_PEM)) || (certificateFile != nil &&
 	    !SSL_use_certificate_file(ssl, [certificateFile
-	    cStringWithEncoding: OF_STRING_ENCODING_NATIVE],
+	    cStringUsingEncoding: OF_STRING_ENCODING_NATIVE],
 	    SSL_FILETYPE_PEM)) || SSL_connect(ssl) != 1) {
 		[super close];
 		@throw [OFConnectionFailedException
@@ -226,9 +226,9 @@ locking_callback(int mode, int n, const char *file, int line)
 	SSL_set_accept_state(newSocket->ssl);
 
 	if (!SSL_use_PrivateKey_file(newSocket->ssl, [privateKeyFile
-	    cStringWithEncoding: OF_STRING_ENCODING_NATIVE],
+	    cStringUsingEncoding: OF_STRING_ENCODING_NATIVE],
 	    SSL_FILETYPE_PEM) || !SSL_use_certificate_file(newSocket->ssl,
-	    [certificateFile cStringWithEncoding: OF_STRING_ENCODING_NATIVE],
+	    [certificateFile cStringUsingEncoding: OF_STRING_ENCODING_NATIVE],
 	    SSL_FILETYPE_PEM) || SSL_accept(newSocket->ssl) != 1) {
 		/* We only want to close the OFTCPSocket */
 		object_setClass(newSocket, [OFTCPSocket class]);
@@ -375,8 +375,8 @@ locking_callback(int mode, int n, const char *file, int line)
 	}
 
 	data = [OFDataArray dataArray];
-	[data addItemsFromCArray: buffer
-			   count: length];
+	[data addItems: buffer
+		 count: length];
 
 	return data;
 }
diff --git a/src/X509Certificate.m b/src/X509Certificate.m
index 631cd02..396e4cb 100644
--- a/src/X509Certificate.m
+++ b/src/X509Certificate.m
@@ -50,7 +50,7 @@
 					     mode: @"r"];
 		OFDataArray *data = [fd readDataArrayTillEndOfStream];
 		[fd close];
-		const unsigned char *dataCArray = [data cArray];
+		const unsigned char *dataCArray = [data items];
 		crt = d2i_X509(NULL, &dataCArray, [data count]);
 		[pool release];
 		if (crt == NULL)