diff --git a/Source/Core/Common/Src/IniFile.cpp b/Source/Core/Common/Src/IniFile.cpp
index c44da39e94..09a3aca415 100644
--- a/Source/Core/Common/Src/IniFile.cpp
+++ b/Source/Core/Common/Src/IniFile.cpp
@@ -273,7 +273,7 @@ bool IniFile::Load(const char* filename)
 
 	sections.clear();
 	sections.push_back(Section(""));
-	//first section consists of the comments before the first real section
+	// first section consists of the comments before the first real section
 
 	// Open file
 	std::ifstream in;
@@ -289,6 +289,14 @@ bool IniFile::Load(const char* filename)
 		char templine[MAX_BYTES];
 		in.getline(templine, MAX_BYTES);
 		std::string line = templine;
+		 
+#ifndef _WIN32
+		// Check for CRLF eol and convert it to LF
+		if (!line.empty() && line.at(line.size()-1) == '\r')
+		{
+			line.erase(line.size()-1);
+		}
+#endif
 
 		if (in.eof())
 		{
diff --git a/Source/Core/DolphinWX/Src/ISOProperties.cpp b/Source/Core/DolphinWX/Src/ISOProperties.cpp
index 5e77fef6bb..a5c10450a0 100644
--- a/Source/Core/DolphinWX/Src/ISOProperties.cpp
+++ b/Source/Core/DolphinWX/Src/ISOProperties.cpp
@@ -243,7 +243,7 @@ void CISOProperties::CreateGUIControls()
 	//issues
 	sEmuIssues = new wxBoxSizer(wxHORIZONTAL);
 	EmuIssues = new wxTextCtrl(m_GameConfig,ID_EMU_ISSUES, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0,wxDefaultValidator);
-	EmuIssuesText = new wxStaticText(m_GameConfig,ID_EMUISSUES_TEXT,_("Emulation Issues(for when emustate is 'Problems'):"), wxDefaultPosition, wxDefaultSize);
+	EmuIssuesText = new wxStaticText(m_GameConfig,ID_EMUISSUES_TEXT,_("Emulation Issues (for when emustate is 'Problems'):"), wxDefaultPosition, wxDefaultSize);
 
 	// Action Replay Cheats
 	sbCheats = new wxStaticBoxSizer(wxVERTICAL, m_CheatPage, _("Action Replay Codes"));
diff --git a/Source/Core/DolphinWX/Src/MemcardManager.cpp b/Source/Core/DolphinWX/Src/MemcardManager.cpp
index b4eac93770..8c59c26750 100644
--- a/Source/Core/DolphinWX/Src/MemcardManager.cpp
+++ b/Source/Core/DolphinWX/Src/MemcardManager.cpp
@@ -21,7 +21,7 @@
 #include "wx/mstream.h"
 //#define DEBUG_MCM  true
 #define DEFAULTS wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator
-#define ARROWS slot ? "" : ARROW[slot], slot ? ARROW[slot] : ""
+#define ARROWS slot ? _T("") : ARROW[slot], slot ? ARROW[slot] : _T("")
 
 const u8 hdr[] = {
 0x42,0x4D,
@@ -206,7 +206,7 @@ void CMemcardManager::CreateGUIControls()
 {
 	// Create the controls for both memcards
 
-	char ARROW[2][3] = {{'<','-',0,}, {'-','>',0}};
+	const wxChar* ARROW[2] = {_T("<-"), _T("->")};
 
 	m_ConvertToGci = new wxButton(this, ID_CONVERTTOGCI, wxT("Convert to GCI"), DEFAULTS);