diff --git a/src/lib/FlightTasks/tasks/Auto/FlightTaskAuto.cpp b/src/lib/FlightTasks/tasks/Auto/FlightTaskAuto.cpp
index de5495f6a1..1fb231e72f 100644
--- a/src/lib/FlightTasks/tasks/Auto/FlightTaskAuto.cpp
+++ b/src/lib/FlightTasks/tasks/Auto/FlightTaskAuto.cpp
@@ -228,7 +228,7 @@ void FlightTaskAuto::_set_heading_from_mode()
 	switch (MPC_YAW_MODE.get()) {
 
 	case 0: { // Heading points towards the current waypoint.
-			v = Vector2f(&_target(0)) - Vector2f(&_position(0));
+			v = Vector2f(_target(0), _target(1)) - Vector2f(_position(0), _position(1));
 			break;
 		}
 
diff --git a/src/lib/FlightTasks/tasks/Utility/StraightLine.cpp b/src/lib/FlightTasks/tasks/Utility/StraightLine.cpp
index 681fab26b6..2f89edeaaa 100644
--- a/src/lib/FlightTasks/tasks/Utility/StraightLine.cpp
+++ b/src/lib/FlightTasks/tasks/Utility/StraightLine.cpp
@@ -113,7 +113,7 @@ float StraightLine::getMaxAcc()
 	Vector3f u_orig_to_target = (_target - _origin).unit_or_zero();
 
 	// calculate the maximal horizontal acceleration
-	float divider = Vector2f(u_orig_to_target.data()).length();
+	float divider = Vector2f(u_orig_to_target(0), u_orig_to_target(1)).length();
 	float max_acc_hor = MPC_ACC_HOR_MAX.get();
 
 	if (divider > FLT_EPSILON) {