diff --git a/src/osd/modules/debugger/osx/debugconsole.m b/src/osd/modules/debugger/osx/debugconsole.m
index 2f5f7746e5f..d869355fd46 100644
--- a/src/osd/modules/debugger/osx/debugconsole.m
+++ b/src/osd/modules/debugger/osx/debugconsole.m
@@ -132,24 +132,24 @@
 	[window makeFirstResponder:commandField];
 
 	// calculate the optimal size for everything
-	NSRect	available = [[NSScreen mainScreen] visibleFrame];
-	NSRect	windowFrame = [window frame];
-	NSSize	regCurrent = [regScroll frame].size;
-	NSSize	regSize = [NSScrollView frameSizeForContentSize:[regView maximumFrameSize]
-									  hasHorizontalScroller:YES
-										hasVerticalScroller:YES
-												 borderType:[regScroll borderType]];
-	NSSize	dasmCurrent = [dasmScroll frame].size;
-	NSSize	dasmSize = [NSScrollView frameSizeForContentSize:[dasmView maximumFrameSize]
-									  hasHorizontalScroller:YES
-										hasVerticalScroller:YES
-												 borderType:[dasmScroll borderType]];
-	NSSize	consoleCurrent = [consoleContainer frame].size;
-	NSSize	consoleSize = [NSScrollView frameSizeForContentSize:[consoleView maximumFrameSize]
-										  hasHorizontalScroller:YES
-											hasVerticalScroller:YES
-													 borderType:[consoleScroll borderType]];
-	NSSize	adjustment;
+	NSRect const	available = [[NSScreen mainScreen] visibleFrame];
+	NSSize const	regCurrent = [regScroll frame].size;
+	NSSize const	regSize = [NSScrollView frameSizeForContentSize:[regView maximumFrameSize]
+											  hasHorizontalScroller:YES
+												hasVerticalScroller:YES
+														 borderType:[regScroll borderType]];
+	NSSize const	dasmCurrent = [dasmScroll frame].size;
+	NSSize const	dasmSize = [NSScrollView frameSizeForContentSize:[dasmView maximumFrameSize]
+											  hasHorizontalScroller:YES
+												hasVerticalScroller:YES
+														 borderType:[dasmScroll borderType]];
+	NSSize const	consoleCurrent = [consoleContainer frame].size;
+	NSSize			consoleSize = [NSScrollView frameSizeForContentSize:[consoleView maximumFrameSize]
+												  hasHorizontalScroller:YES
+													hasVerticalScroller:YES
+															 borderType:[consoleScroll borderType]];
+	NSRect			windowFrame = [window frame];
+	NSSize			adjustment;
 
 	consoleSize.width += consoleCurrent.width - [consoleScroll frame].size.width;
 	consoleSize.height += consoleCurrent.height - [consoleScroll frame].size.height;
diff --git a/src/osd/sdl/aueffectutil.m b/src/osd/sdl/aueffectutil.m
index 03dea64112d..d5c1e18d3e6 100644
--- a/src/osd/sdl/aueffectutil.m
+++ b/src/osd/sdl/aueffectutil.m
@@ -306,7 +306,17 @@ static void UpdateChangeCountCallback(void                      *userData,
 
 	[self loadEffectUI];
 	if (nil != restoreFrame)
+	{
 		[window setFrameFromString:restoreFrame];
+	}
+	else
+	{
+		NSRect const available = [[NSScreen mainScreen] visibleFrame];
+		NSRect frame = [window frame];
+		frame.origin.x = (NSWidth(available) - NSWidth(frame)) / 4;
+		frame.origin.y = (NSHeight(available) - NSHeight(frame)) * 3 / 4;
+		[window setFrame:frame display:YES animate:NO];
+	}
 }
 
 - (BOOL)readFromData:(NSData *)data ofType:(NSString *)type error:(NSError **)error {
@@ -836,7 +846,9 @@ static void UpdateChangeCountCallback(void                      *userData,
 	item = [parent addItemWithTitle:@"Help" action:NULL keyEquivalent:@""];
 	[parent setSubmenu:menu forItem:item];
 	[menu release];
-	[NSApp setHelpMenu:menu];
+	[menu setValue:@"NSHelpMenu" forKey:@"name"];
+	if ([NSApp respondsToSelector:@selector(setHelpMenu:)])
+		[NSApp performSelector:@selector(setHelpMenu:) withObject:menu];
 
 	item = [menu addItemWithTitle:[NSString stringWithFormat:@"%@ Help", appName] action:@selector(showHelp:) keyEquivalent:@"?"];
 }