diff --git a/src/lib/utility/scheduling/TaskReturnSuccessWhile.h b/src/lib/utility/scheduling/TaskReturnSuccessWhile.h
index 26b23421..f0522283 100644
--- a/src/lib/utility/scheduling/TaskReturnSuccessWhile.h
+++ b/src/lib/utility/scheduling/TaskReturnSuccessWhile.h
@@ -60,6 +60,12 @@ Task::TaskState TaskReturnSuccessWhile<T>::doUpdate(std::shared_ptr<Blackboard>
 			return STATE_SUCCESS;
 		}
 		break;
+	case CONDITION_EQUALS:
+		if (lhsValue == m_rhsValue)
+		{
+			return STATE_SUCCESS;
+		}
+		break;
 	default:
 		return STATE_FAILURE;
 	}
diff --git a/src/lib_cxx/data/parser/cxx/PreprocessorCallbacks.cpp b/src/lib_cxx/data/parser/cxx/PreprocessorCallbacks.cpp
index b228f092..2fb4df67 100644
--- a/src/lib_cxx/data/parser/cxx/PreprocessorCallbacks.cpp
+++ b/src/lib_cxx/data/parser/cxx/PreprocessorCallbacks.cpp
@@ -61,10 +61,10 @@ void PreprocessorCallbacks::InclusionDirective(
 		{
 
 			NameHierarchy referencedNameHierarchy;
-			referencedNameHierarchy.push(std::make_shared<NameElement>(includedFilePath.fileName()));
+			referencedNameHierarchy.push(std::make_shared<NameElement>(includedFilePath.str()));
 
 			NameHierarchy contextNameHierarchy;
-			contextNameHierarchy.push(std::make_shared<NameElement>(m_currentPath.fileName()));
+			contextNameHierarchy.push(std::make_shared<NameElement>(m_currentPath.str()));
 
 			m_client->recordReference(
 				REFERENCE_INCLUDE,