@@ -20,15 +20,15 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
 #import <ObjFW/OFString.h>
 
+#import <ObjFW/macros.h>
+
 #import "IRCChannel.h"
 
 @implementation IRCChannel
-@synthesize name, users;
-
 + channelWithName: (OFString*)name
 {
 	return [[[self alloc] initWithName: name] autorelease];
 }
 
@@ -52,14 +52,24 @@
 	[name release];
 	[users release];
 
 	[super dealloc];
 }
+
+- (OFString*)name
+{
+	OF_GETTER(name, YES)
+}
+
+- (OFSet*)users
+{
+	return [[users copy] autorelease];
+}
 
 - (OFString*)description
 {
-	return name;
+	return [[name copy] autorelease];
 }
 
 - (void)IRC_addUser: (OFString*)user
 {
 	[users addObject: user];