diff --git a/include/cross.h b/include/cross.h
index 8e2268d1..697cb6ee 100644
--- a/include/cross.h
+++ b/include/cross.h
@@ -74,7 +74,7 @@ public:
 	static void CreatePlatformConfigDir(std::string& in);
 	static void ResolveHomedir(std::string & temp_line);
 	static void CreateDir(std::string const& temp);
-	static bool Cross::IsPathAbsolute(std::string const& in);
+	static bool IsPathAbsolute(std::string const& in);
 };
 
 
diff --git a/src/misc/programs.cpp b/src/misc/programs.cpp
index 724d6a9b..21f378f1 100644
--- a/src/misc/programs.cpp
+++ b/src/misc/programs.cpp
@@ -459,10 +459,10 @@ void CONFIG::Run(void) {
 						std::string propvalues;
 						std::vector<Value> pv = p->GetValues();
 						
-						if (p->Get_type()==Value::Etype::V_BOOL) {
+						if (p->Get_type()==Value::V_BOOL) {
 							// possible values for boolean are true, false
 							propvalues += "true, false";
-						} else if (p->Get_type()==Value::Etype::V_INT) {
+						} else if (p->Get_type()==Value::V_INT) {
 							// print min, max for integer values if used
 							Prop_int* pint = dynamic_cast <Prop_int*>(p);
 							if (pint==NULL) E_Exit("Int property dynamic cast failed.");
diff --git a/src/misc/setup.cpp b/src/misc/setup.cpp
index a0184b49..f62034f0 100644
--- a/src/misc/setup.cpp
+++ b/src/misc/setup.cpp
@@ -995,7 +995,7 @@ int CommandLine::GetParameterFromList(const char* const params[], std::vector<st
 	cmd_it it = cmds.begin();
 	while(it!=cmds.end()) {
 		bool found = false;
-		for(Bitu i = 0; params[i]!=""; i++) {
+		for(Bitu i = 0; *params[i]!=0; i++) {
 			if (!strcasecmp((*it).c_str(),params[i])) {
 				// found a parameter
 				found = true;