diff --git a/src/XMPPConnection.m b/src/XMPPConnection.m
index 0fac880..bae86d2 100644
--- a/src/XMPPConnection.m
+++ b/src/XMPPConnection.m
@@ -702,7 +702,7 @@
 					      namespace: XMPP_NS_SESSION];
 	OFXMLElement *mechs = [element elementForName: @"mechanisms"
 					    namespace: XMPP_NS_SASL];
-	OFMutableArray *mechanisms = [OFMutableArray array];
+	OFMutableSet *mechanisms = [OFMutableSet set];
 
 	if (starttls != nil) {
 		[self sendStanza:
diff --git a/src/XMPPSCRAMAuth.m b/src/XMPPSCRAMAuth.m
index 39b83e8..140e606 100644
--- a/src/XMPPSCRAMAuth.m
+++ b/src/XMPPSCRAMAuth.m
@@ -151,10 +151,12 @@
 	GS2Header = nil;
 
 	if (authzid)
-		GS2Header = [[OFString alloc] initWithFormat: @"%@,a=%@,",
-			(plusAvailable ? @"p=tls-unique" : @"y"), authzid];
+		GS2Header = [[OFString alloc]
+		    initWithFormat: @"%@,a=%@,",
+				    (plusAvailable ? @"p=tls-unique" : @"y"),
+				    authzid];
 	else
-		GS2Header = plusAvailable ? @"p=tls-unique,," : @"y,,";
+		GS2Header = (plusAvailable ? @"p=tls-unique,," : @"y,,");
 
 	[cNonce release];
 	cNonce = nil;