diff --git a/es-app/src/EmulationStation.h b/es-app/src/EmulationStation.h
index 3fbb279050..52d319004c 100644
--- a/es-app/src/EmulationStation.h
+++ b/es-app/src/EmulationStation.h
@@ -7,7 +7,7 @@
 #define PROGRAM_VERSION_MAINTENANCE  1
 #define PROGRAM_VERSION_STRING "2.0.1a"
 
-#define PROGRAM_BUILT_STRING __DATE__ " - " __TIME__
+#define PROGRAM_BUILT_STRING "Relased March 2015"
 
 #define RESOURCE_VERSION_STRING "2,0,1\0"
 #define RESOURCE_VERSION PROGRAM_VERSION_MAJOR,PROGRAM_VERSION_MINOR,PROGRAM_VERSION_MAINTENANCE
diff --git a/es-core/src/Window.cpp b/es-core/src/Window.cpp
index 76bb1754e3..8c88b5b75d 100644
--- a/es-core/src/Window.cpp
+++ b/es-core/src/Window.cpp
@@ -274,8 +274,8 @@ void Window::setHelpPrompts(const std::vector<HelpPrompt>& prompts, const HelpSt
 				// yes, it has!
 
 				// can we combine? (dpad only)
-				if((it->first == "up/down" && addPrompts.at(mappedTo->second).first == "left/right") ||
-					(it->first == "left/right" && addPrompts.at(mappedTo->second).first == "up/down"))
+				if((strcmp((it->first) , "up/down")) == 0 && strcmp(addPrompts.at(mappedTo->second).first , "left/right") == 0 ||
+					(strcmp((it->first) , "left/right") == 0 && strcmp(addPrompts.at(mappedTo->second).first , "up/down")) == 0)
 				{
 					// yes!
 					addPrompts.at(mappedTo->second).first = "up/down/left/right";
diff --git a/es-core/src/components/ComponentGrid.cpp b/es-core/src/components/ComponentGrid.cpp
index 89dd157cc0..97340c964a 100644
--- a/es-core/src/components/ComponentGrid.cpp
+++ b/es-core/src/components/ComponentGrid.cpp
@@ -430,15 +430,15 @@ std::vector<HelpPrompt> ComponentGrid::getHelpPrompts()
 	bool canScrollHoriz = mGridSize.x() > 1;
 	for(auto it = prompts.begin(); it != prompts.end(); it++)
 	{
-		if(it->first == "up/down/left/right")
+		if(strcmp((it->first) , "up/down/left/right") == 0)
 		{
 			canScrollHoriz = false;
 			canScrollVert = false;
 			break;
-		}else if(it->first == "up/down")
+		}else if(strcmp ((it->first) , "up/down") == 0)
 		{
 			canScrollVert = false;
-		}else if(it->first == "left/right")
+		}else if(strcmp ((it->first) , "left/right") == 0)
 		{
 			canScrollHoriz = false;
 		}
diff --git a/es-core/src/components/ComponentList.cpp b/es-core/src/components/ComponentList.cpp
index a16bcb0975..67f6ff0a66 100644
--- a/es-core/src/components/ComponentList.cpp
+++ b/es-core/src/components/ComponentList.cpp
@@ -1,6 +1,7 @@
 #include "components/ComponentList.h"
 #include "Util.h"
 #include "Log.h"
+#include <string.h>
 
 #define TOTAL_HORIZONTAL_PADDING_PX 20
 
@@ -318,7 +319,7 @@ std::vector<HelpPrompt> ComponentList::getHelpPrompts()
 		bool addMovePrompt = true;
 		for(auto it = prompts.begin(); it != prompts.end(); it++)
 		{
-			if(it->first == "up/down" || it->first == "up/down/left/right")
+			if(strcmp((it->first) , "up/down") == 0 || strcmp((it->first) , "up/down/left/right") == 0)
 			{
 				addMovePrompt = false;
 				break;