Index: Object.cpp
===================================================================
--- Object.cpp	(revision 237)
+++ Object.cpp	(working copy)
@@ -195,6 +195,7 @@
 		if(this->GetElements()->size() == 0) {
 			overallResult = OvalEnum::RESULT_TRUE;
 		} else {
+			overallResult = OvalEnum::RESULT_TRUE;
 
 			// vector of result values before they are combined
 			IntVector iResults;
Index: Test.cpp
===================================================================
--- Test.cpp	(revision 237)
+++ Test.cpp	(working copy)
@@ -375,7 +375,7 @@
                         // get the element as an item
                         Item* currentItem = Item::GetItemById(itemId);
 
-                        if(referencedObject->Analyze(currentItem) == OvalEnum::RESULT_TRUE) {
+                        if(referencedObject->Analyze(currentItem) == true) {
                             TestedItem* testedItem = new TestedItem();
                             testedItem->SetItem(currentItem);
                             this->AppendTestedItem(testedItem);
Index: EntityComparator.cpp
===================================================================
--- EntityComparator.cpp	(revision 237)
+++ EntityComparator.cpp	(working copy)
@@ -620,10 +620,13 @@
 
 	} else {
 		char delm = versionStr.at(index);
+		char* delimiter = (char*)malloc(sizeof(char)*2);
+		delimiter[0] = delm;
+		delimiter[1] = '\0';
 
 		char* theString = (char*)malloc(sizeof(char)*(versionStr.length()+1));
 		theString = strcpy(theString, versionStr.c_str());
-		char* token = strtok(theString, &delm);		
+		char* token = strtok(theString, delimiter);		
 
 		if(token == NULL) {
 			if(theString != NULL) {
@@ -654,7 +657,7 @@
 				tokens->push_back(tokenInt);
 
 				//	Get the next token
-				token = strtok(NULL, &delm);
+				token = strtok(NULL, delimiter);
 			}
 		}