The last fix creade a new problem, hopfully this fixes the first and secound problem

src/Unit.cpp

@@ -341,7 +341,7 @@ Unit Unit::getTarget() const
 		CCUnitID t_id = getUnitPtr()->orders[0].target_unit_tag;
 
 		// if it doesn't have a target. Return itself
-		if (m_bot->GetUnit(t_id).isValid()) {
+		if (!this->hasTarget()) {
 			return *this;
 		}