@@ -38,17 +38,17 @@
 #import "XMPPJID.h"
 #import "XMPPMulticastDelegate.h"
 #import "namespaces.h"
 
 @implementation XMPPRoster
-- initWithConnection: (XMPPConnection*)connection_
+- initWithConnection: (XMPPConnection*)connection
 {
 	self = [super init];
 
 	@try {
 		_rosterItems = [[OFMutableDictionary alloc] init];
-		_connection = connection_;
+		_connection = connection;
 		[_connection addDelegate: self];
 		_delegates = [[XMPPMulticastDelegate alloc] init];
 		_dataStorage = [_connection dataStorage];
 	} @catch (id e) {
 		[self release];
@@ -353,11 +353,11 @@
 
 		if (![[element name] isEqual: @"item"] ||
 		    ![[element namespace] isEqual: XMPP_NS_ROSTER])
 			continue;
 
-		pool = [OFAutoreleasePool new];
+		pool = [[OFAutoreleasePool alloc] init];
 		rosterItem = [self XMPP_rosterItemWithXMLElement: element];
 
 		[self XMPP_updateRosterItem: rosterItem];
 		[pool release];
 	}