diff --git a/Frameworks/OakAppKit/src/OakPasteboard.mm b/Frameworks/OakAppKit/src/OakPasteboard.mm
index f8b59725..8209a622 100644
--- a/Frameworks/OakAppKit/src/OakPasteboard.mm
+++ b/Frameworks/OakAppKit/src/OakPasteboard.mm
@@ -292,7 +292,7 @@ namespace
 	static NSMutableDictionary* SharedInstances = [NSMutableDictionary new];
 	if(![SharedInstances objectForKey:aName])
 	{
-		[SharedInstances setObject:[[[self alloc] initWithName:aName] autorelease] forKey:aName];
+		[SharedInstances setObject:[[[OakPasteboard alloc] initWithName:aName] autorelease] forKey:aName];
 		if(![aName isEqualToString:NSGeneralPboard])
 			[[SharedInstances objectForKey:aName] setAvoidsDuplicates:YES];
 	}
diff --git a/Frameworks/OakFilterList/src/OakAbbreviations.mm b/Frameworks/OakFilterList/src/OakAbbreviations.mm
index 2b150df9..e74db89b 100644
--- a/Frameworks/OakFilterList/src/OakAbbreviations.mm
+++ b/Frameworks/OakFilterList/src/OakAbbreviations.mm
@@ -18,7 +18,7 @@ static NSString* const FCExpandedStringKey	= @"long";
 {
 	static NSMutableDictionary* SharedInstances = [NSMutableDictionary new];
 	if(!SharedInstances[aName])
-		SharedInstances[aName] = [[self alloc] initWithName:aName];
+		SharedInstances[aName] = [[OakAbbreviations alloc] initWithName:aName];
 	return SharedInstances[aName];
 }
 
diff --git a/Frameworks/OakFilterList/src/datasources/SymbolChooser.mm b/Frameworks/OakFilterList/src/datasources/SymbolChooser.mm
index 63ae8ad1..01195fae 100644
--- a/Frameworks/OakFilterList/src/datasources/SymbolChooser.mm
+++ b/Frameworks/OakFilterList/src/datasources/SymbolChooser.mm
@@ -90,7 +90,7 @@ OAK_DEBUG_VAR(FilterList_SymbolChooser);
 
 + (id)symbolChooserForDocument:(document::document_ptr)aDocument
 {
-	return [[self alloc] initWithDocument:aDocument];
+	return [[SymbolChooser alloc] initWithDocument:aDocument];
 }
 
 - (NSString*)title
diff --git a/PlugIns/dialog-1.x b/PlugIns/dialog-1.x
index 25621eff..8f4fd0ed 160000
--- a/PlugIns/dialog-1.x
+++ b/PlugIns/dialog-1.x
@@ -1 +1 @@
-Subproject commit 25621eff522cfed8ed171492d8840dd042edf984
+Subproject commit 8f4fd0ede10740cda321a8c6dcde3945713ce032