diff --git a/stepmania/src/arch/Dialog/Dialog.cpp b/stepmania/src/arch/Dialog/Dialog.cpp
index 9c4a4c827e..2f522285f9 100644
--- a/stepmania/src/arch/Dialog/Dialog.cpp
+++ b/stepmania/src/arch/Dialog/Dialog.cpp
@@ -39,7 +39,7 @@ void Dialog::Init()
 			if( !DriversToTry[i].CompareNoCase("Win32") ) g_pImpl = new DialogDriver_Win32;
 #endif
 #if defined(HAVE_DIALOG_COCOA)
-			if( !DriversToTry[i].CompareNoCase("Cocoa") ) g_pImpl = new LoadingWindow_Cocoa;
+			if( !DriversToTry[i].CompareNoCase("Cocoa") ) g_pImpl = new DialogDriver_Cocoa;
 #endif
 			if( !DriversToTry[i].CompareNoCase("Null") ) g_pImpl = new DialogDriverNull;
 		}
diff --git a/stepmania/src/arch/Dialog/DialogDriver_Cocoa.cpp b/stepmania/src/arch/Dialog/DialogDriver_Cocoa.cpp
index 4ecaa96219..ceed4e0ee4 100644
--- a/stepmania/src/arch/Dialog/DialogDriver_Cocoa.cpp
+++ b/stepmania/src/arch/Dialog/DialogDriver_Cocoa.cpp
@@ -27,8 +27,6 @@ static SInt16 ShowAlert( int type, CFStringRef message, CFStringRef OK, CFString
 
 void DialogDriver_Cocoa::OK( CString sMessage, CString ID )
 {
-	bool allowHush = ID != "";
-
 	CFStringRef message = CFStringCreateWithCString(NULL, sMessage, kCFStringEncodingASCII);
 	SInt16 result = ShowAlert(kAlertNoteAlert, message, CFSTR("OK"), CFSTR("Don't show again"));
 
@@ -49,20 +47,20 @@ Dialog::Result DialogDriver_Cocoa::AbortRetryIgnore( CString sMessage, CString I
 {
 	CFStringRef error = CFStringCreateWithCString( NULL, sMessage, kCFStringEncodingASCII );
 	SInt16 result = ShowAlert( kAlertNoteAlert, error, CFSTR("Retry"), CFSTR("Ignore") );
-	ArchHooks::MessageBoxResult ret;
+	Dialog::Result ret;
 
 	CFRelease(error);
 	switch (result)
 	{
 	case kAlertStdAlertOKButton:
-		ret = retry;
+		ret = Dialog::retry;
 		break;
 	case kAlertStdAlertCancelButton:
-		ret = ignore;
+		ret = Dialog::ignore;
 		break;
 	default:
 		ASSERT(0);
-		ret = ignore;
+		ret = Dialog::ignore;
 	}
     
     return ret;
diff --git a/stepmania/src/arch/Dialog/DialogDriver_Cocoa.h b/stepmania/src/arch/Dialog/DialogDriver_Cocoa.h
index 9612cf99ed..77747c8666 100644
--- a/stepmania/src/arch/Dialog/DialogDriver_Cocoa.h
+++ b/stepmania/src/arch/Dialog/DialogDriver_Cocoa.h
@@ -8,7 +8,7 @@ class DialogDriver_Cocoa: public DialogDriver
 public:
     void Error(CString sError, CString ID);
 	void OK(CString sMessage, CString ID);
-    MessageBoxResult AbortRetryIgnore(CString sMessage, CString ID);
+    Dialog::Result AbortRetryIgnore(CString sMessage, CString ID);
 };
 
 #define HAVE_DIALOG_COCOA