diff --git a/Source/Core/Core/Src/IPC_HLE/hci.h b/Source/Core/Core/Src/IPC_HLE/hci.h
index 0d10b39dc7..c746fecc89 100644
--- a/Source/Core/Core/Src/IPC_HLE/hci.h
+++ b/Source/Core/Core/Src/IPC_HLE/hci.h
@@ -1,18 +1,9 @@
 #ifndef _NETBT_HCI_H_
 #define _NETBT_HCI_H_
 
+#include "CommonTypes.h"
 #pragma pack(push, 1)
 
-typedef u8 uint8_t;
-#ifdef _WIN32
-    typedef s8 int8_t;
-#endif
-typedef u16 uint16_t;
-typedef s16 int16_t;
-typedef u32 uint32_t;
-typedef s32 int32_t;
-
-
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/Source/Core/DolphinWX/Src/ISOProperties.cpp b/Source/Core/DolphinWX/Src/ISOProperties.cpp
index 0c24587d90..b7e429241c 100644
--- a/Source/Core/DolphinWX/Src/ISOProperties.cpp
+++ b/Source/Core/DolphinWX/Src/ISOProperties.cpp
@@ -128,7 +128,7 @@ CISOProperties::CISOProperties(const std::string fileName, wxWindow* parent, wxW
 	wxString name;
 	CopySJISToString(name, OpenGameListItem->GetName(0).c_str());
 
-	SetTitle(wxString::Format(_("%s%s: %s - %s"), filename.c_str(), extension.c_str(), OpenGameListItem->GetUniqueID().c_str(), name));
+	SetTitle(wxString::Format(_("%s%s: %s - %s"), filename.c_str(), extension.c_str(), OpenGameListItem->GetUniqueID().c_str(), name.c_str()));
 }
 
 CISOProperties::~CISOProperties()
@@ -785,7 +785,7 @@ void CISOProperties::ChangeBannerDetails(int lang)
 	CopySJISToString(description, OpenGameListItem->GetDescription(lang).c_str());
 
 	m_ShortName->SetValue(name);
-	m_Maker->SetValue(OpenGameListItem->GetCompany().c_str());//dev too
+	m_Maker->SetValue(wxString::FromAscii(OpenGameListItem->GetCompany().c_str()));//dev too
 	m_Comment->SetValue(description);
 }
 
@@ -836,4 +836,4 @@ bool CISOProperties::CopySJISToString( wxString& _rDestination, const char* _src
 	//returnCode = true;
 #endif
 	return returnCode;
-}
\ No newline at end of file
+}
diff --git a/Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp b/Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp
index 3be64ad090..816be3847b 100644
--- a/Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp
+++ b/Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp
@@ -1176,7 +1176,7 @@ bool GCMemcard::formatWIP(int slot, bool New, bool sjis)
 	}
 	fread(&m_SRAM, 1, 64, pStream);
 	fclose(pStream);
-	rand = time = 0XFAB12B2D9FD80700;//0x500;//gettime();
+	rand = time = 0XFAB12B2D9FD80700ULL;//0x500;//gettime();
 
 	//////////////////////////////////////