diff --git a/Source/Project64/N64 System/N64 Class.cpp b/Source/Project64/N64 System/N64 Class.cpp
index 501d4d755..aec1fba2a 100644
--- a/Source/Project64/N64 System/N64 Class.cpp	
+++ b/Source/Project64/N64 System/N64 Class.cpp	
@@ -1446,7 +1446,7 @@ bool CN64System::SaveState(void)
 
 	CPath SavedFileName(FileName);
 	
-	g_Notify->DisplayMessage(5,L"%s %s",SaveMessage.c_str(),SavedFileName.GetNameExtension().c_str());
+    g_Notify->DisplayMessage(5,L"%s %s",SaveMessage.c_str(),SavedFileName.GetNameExtension().ToUTF16().c_str());
 	g_Notify->RefreshMenu();
 	WriteTrace(TraceDebug,__FUNCTION__ ": Done");
 	return true;
@@ -1599,7 +1599,7 @@ bool CN64System::LoadState(LPCSTR FileName) {
 			OPEN_EXISTING,FILE_ATTRIBUTE_NORMAL | FILE_FLAG_RANDOM_ACCESS, NULL);
 		if (hSaveFile == INVALID_HANDLE_VALUE) 
         {
-			g_Notify->DisplayMessage(5,L"%s %s",GS(MSG_UNABLED_LOAD_STATE),FileNameStr.c_str());
+            g_Notify->DisplayMessage(5,L"%s %s",GS(MSG_UNABLED_LOAD_STATE),FileNameStr.ToUTF16().c_str());
 			return false;
 		}
 		SetFilePointer(hSaveFile,0,NULL,FILE_BEGIN);	
@@ -1692,7 +1692,7 @@ bool CN64System::LoadState(LPCSTR FileName) {
 	}
 	WriteTrace(TraceDebug,__FUNCTION__ ": 13");
 	std::wstring LoadMsg = g_Lang->GetString(MSG_LOADED_STATE);
-	g_Notify->DisplayMessage(5,L"%s %s",LoadMsg.c_str(),CPath(FileNameStr).GetNameExtension().c_str());
+    g_Notify->DisplayMessage(5,L"%s %s",LoadMsg.c_str(),CPath(FileNameStr).GetNameExtension().ToUTF16().c_str());
 	WriteTrace(TraceDebug,__FUNCTION__ ": Done");
 	return true;
 }
diff --git a/Source/Project64/N64 System/N64 Rom Class.cpp b/Source/Project64/N64 System/N64 Rom Class.cpp
index 1e60ac3cc..bb77d1a7d 100644
--- a/Source/Project64/N64 System/N64 Rom Class.cpp	
+++ b/Source/Project64/N64 System/N64 Rom Class.cpp	
@@ -262,7 +262,7 @@ bool CN64Rom::IsValidRomImage ( BYTE Test[4] ) {
 	return false;
 }
 
-void CN64Rom::NotificationCB ( LPCSTR Status, CN64Rom * /*_this*/ )
+void CN64Rom::NotificationCB ( LPCWSTR Status, CN64Rom * /*_this*/ )
 {
 	g_Notify->DisplayMessage(5,L"%s",Status);
 }
@@ -292,7 +292,7 @@ bool CN64Rom::LoadN64Image ( const char * FileLoc, bool LoadBootCodeOnly ) {
 		}	
 
 		C7zip ZipFile(FullPath);
-		ZipFile.SetNotificationCallback((C7zip::LP7ZNOTIFICATION)NotificationCB,this);
+		//ZipFile.SetNotificationCallback((C7zip::LP7ZNOTIFICATION)NotificationCB,this);
 		for (int i = 0; i < ZipFile.NumFiles(); i++)
 		{
 			CSzFileItem * f = ZipFile.FileItem(i);
diff --git a/Source/Project64/N64 System/N64 Rom Class.h b/Source/Project64/N64 System/N64 Rom Class.h
index c0d357bd8..fde5303b8 100644
--- a/Source/Project64/N64 System/N64 Rom Class.h	
+++ b/Source/Project64/N64 System/N64 Rom Class.h	
@@ -31,7 +31,7 @@ class CN64Rom :
 	bool   AllocateAndLoadZipImage ( const char * FileLoc, bool LoadBootCodeOnly );
 	void   ByteSwapRom             ( void );
     void   SetError                ( LanguageStringID ErrorMsg );
-	static void  __stdcall NotificationCB ( LPCSTR Status, CN64Rom * _this );
+	static void  __stdcall NotificationCB ( LPCWSTR Status, CN64Rom * _this );
 	void   CalculateCicChip         ( void );
 
 public:
diff --git a/Source/Project64/User Interface/Gui Class.cpp b/Source/Project64/User Interface/Gui Class.cpp
index d465f695c..cc60cf652 100644
--- a/Source/Project64/User Interface/Gui Class.cpp	
+++ b/Source/Project64/User Interface/Gui Class.cpp	
@@ -31,7 +31,7 @@ CMainGui::CMainGui (bool bMainWindow, const char * WindowTitle ) :
 	m_ResetPlugins(false),
 	m_ResetInfo(NULL)
 {
-	m_Menu     = NULL;
+	m_Menu = NULL;
 	
 	m_hMainWindow = 0;
 	m_hStatusWnd  = 0;
diff --git a/Source/Project64/User Interface/Rom Browser Class.cpp b/Source/Project64/User Interface/Rom Browser Class.cpp
index 872227f22..74fe9f12e 100644
--- a/Source/Project64/User Interface/Rom Browser Class.cpp	
+++ b/Source/Project64/User Interface/Rom Browser Class.cpp	
@@ -548,7 +548,7 @@ bool CRomBrowser::GetRomFileNames( strlist & FileList, const CPath & BaseDirecto
 	return true;
 }
 
-void CRomBrowser::NotificationCB ( LPCSTR Status, CRomBrowser * /*_this*/ )
+void CRomBrowser::NotificationCB ( LPCWSTR Status, CRomBrowser * /*_this*/ )
 {
  	g_Notify->DisplayMessage(5,L"%s",Status);
 }
@@ -657,7 +657,7 @@ void CRomBrowser::FillRomList ( strlist & FileList, const CPath & BaseDirectory,
 					WriteTrace(TraceDebug,__FUNCTION__ ": 7");
 					memset(&RomInfo, 0, sizeof(ROM_INFO));
 					stdstr_f zipFileName("%s?%s",(LPCSTR)SearchPath,FileName.c_str());
-					ZipFile.SetNotificationCallback((C7zip::LP7ZNOTIFICATION)NotificationCB,this);
+					//ZipFile.SetNotificationCallback((C7zip::LP7ZNOTIFICATION)NotificationCB,this);
 
 					strncpy(RomInfo.szFullFileName, zipFileName.c_str(), sizeof(RomInfo.szFullFileName) - 1);
 					RomInfo.szFullFileName[sizeof(RomInfo.szFullFileName) - 1] = 0;
diff --git a/Source/Project64/User Interface/Rom Browser.h b/Source/Project64/User Interface/Rom Browser.h
index b72c22a85..491f9d2df 100644
--- a/Source/Project64/User Interface/Rom Browser.h	
+++ b/Source/Project64/User Interface/Rom Browser.h	
@@ -173,7 +173,7 @@ class CRomBrowser
 	bool  GetRomFileNames         ( strlist & FileList, const CPath & BaseDirectory, const stdstr & Directory, bool InWatchThread );
 	MD5   RomListHash             ( strlist & FileList );
 
-	static void  __stdcall NotificationCB ( LPCSTR Status, CRomBrowser * _this );
+	static void  __stdcall NotificationCB ( LPCWSTR Status, CRomBrowser * _this );
 
 	//Watch Directory Changed function
 	HANDLE m_WatchThread, m_WatchStopEvent;