@@ -142,14 +142,14 @@
 		}
 
 		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);
 			sock = INVALID_SOCKET;
 			@throw [OFInitializationFailedException
@@ -192,14 +192,14 @@
 	}
 
 	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
 		    exceptionWithClass: [self class]
 				socket: self
@@ -224,13 +224,13 @@
 	}
 
 	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]);
 		[newSocket close];
 		object_setClass(newSocket, object_getClass(self));
@@ -373,12 +373,12 @@
 		/* peer sent the finished message */
 		length = SSL_get_peer_finished(ssl, buffer, 64);
 	}
 
 	data = [OFDataArray dataArray];
-	[data addItemsFromCArray: buffer
-			   count: length];
+	[data addItems: buffer
+		 count: length];
 
 	return data;
 }
 
 - (X509Certificate*)peerCertificate