Index: src/XMPPSCRAMAuth.h
==================================================================
--- src/XMPPSCRAMAuth.h
+++ src/XMPPSCRAMAuth.h
@@ -110,14 +110,14 @@
 	     hash: (Class)hash
     plusAvailable: (bool)plusAvailable;
 
 /// \cond internal
 - (OFString*)XMPP_genNonce;
-- (uint8_t*)XMPP_HMACWithKey: (OFDataArray*)key
+- (const uint8_t*)XMPP_HMACWithKey: (OFDataArray*)key
 			data: (OFDataArray*)data;
 - (OFDataArray*)XMPP_hiWithData: (OFDataArray*)str
 			   salt: (OFDataArray*)salt
 		 iterationCount: (intmax_t)i;
 - (OFDataArray*)XMPP_parseServerFirstMessage: (OFDataArray*)data;
 - (OFDataArray*)XMPP_parseServerFinalMessage: (OFDataArray*)data;
 /// \endcond
 @end

Index: src/XMPPSCRAMAuth.m
==================================================================
--- src/XMPPSCRAMAuth.m
+++ src/XMPPSCRAMAuth.m
@@ -197,11 +197,11 @@
 }
 
 - (OFDataArray*)XMPP_parseServerFirstMessage: (OFDataArray*)data
 {
 	size_t i;
-	uint8_t *clientKey, *serverKey, *clientSignature;
+	const uint8_t *clientKey, *serverKey, *clientSignature;
 	intmax_t iterCount = 0;
 	id <OFHash> hash;
 	OFDataArray *ret, *authMessage, *tmpArray, *salt = nil, *saltedPassword;
 	OFString *tmpString, *sNonce = nil;
 	OFEnumerator *enumerator;
@@ -417,11 +417,11 @@
 	return [OFString stringWithCString: (char*)buf
 				  encoding: OF_STRING_ENCODING_ASCII
 				    length: 64];
 }
 
-- (uint8_t*)XMPP_HMACWithKey: (OFDataArray*)key
+- (const uint8_t*)XMPP_HMACWithKey: (OFDataArray*)key
 			data: (OFDataArray*)data
 {
 	OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init];
 	OFDataArray *k = [OFDataArray dataArray];
 	size_t i, kSize, blockSize = [_hashType blockSize];
@@ -478,11 +478,12 @@
 			   salt: (OFDataArray*)salt
 		 iterationCount: (intmax_t)i
 {
 	OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init];
 	size_t digestSize = [_hashType digestSize];
-	uint8_t *result = NULL, *u, *uOld;
+	uint8_t *result = NULL;
+	const uint8_t *u, *uOld;
 	intmax_t j, k;
 	OFDataArray *salty, *tmp, *ret;
 
 	result = [self allocMemoryWithSize: digestSize];
 

Index: src/XMPPSRVLookup.m
==================================================================
--- src/XMPPSRVLookup.m
+++ src/XMPPSRVLookup.m
@@ -106,11 +106,11 @@
 			@throw [OFInitializationFailedException
 			    exceptionWithClass: [self class]];
 
 		_target = [[OFString alloc]
 		    initWithCString: buffer
-			   encoding: OF_STRING_ENCODING_NATIVE];
+			   encoding: [OFString nativeOSEncoding]];
 	} @catch (id e) {
 		[self release];
 		@throw e;
 	}
 
@@ -216,11 +216,11 @@
 			@throw [OFAddressTranslationFailedException
 			    exceptionWithHost: _domain];
 
 		answer = [self allocMemoryWithSize: pageSize];
 		answerLen = res_nsearch(&_resState,
-		    [request cStringWithEncoding: OF_STRING_ENCODING_NATIVE],
+		    [request cStringWithEncoding: [OFString nativeOSEncoding]],
 		    ns_c_in, ns_t_srv, answer, (int)pageSize);
 
 		if ((answerLen == -1) && ((h_errno == HOST_NOT_FOUND) ||
 		    (h_errno == NO_DATA)))
 			return;