diff --git a/src/devices_models/device_constructors/branch_constructor.jl b/src/devices_models/device_constructors/branch_constructor.jl
index 56ca547ae0..ec1b7d6d9d 100644
--- a/src/devices_models/device_constructors/branch_constructor.jl
+++ b/src/devices_models/device_constructors/branch_constructor.jl
@@ -635,6 +635,7 @@ function construct_device!(
         model,
         network_model,
     )
+    add_feedforward_arguments!(container, model, devices)
     return
 end
 
@@ -668,6 +669,7 @@ function construct_device!(
     add_constraints!(container, HVDCPowerBalance, devices, model, network_model)
     add_constraints!(container, HVDCDirection, devices, model, network_model)
     add_constraint_dual!(container, sys, model)
+    add_feedforward_constraints!(container, model, devices)
     return
 end
 
diff --git a/src/devices_models/device_constructors/hvdcsystems_constructor.jl b/src/devices_models/device_constructors/hvdcsystems_constructor.jl
index d6769f63cd..0e2cb75cf2 100644
--- a/src/devices_models/device_constructors/hvdcsystems_constructor.jl
+++ b/src/devices_models/device_constructors/hvdcsystems_constructor.jl
@@ -61,8 +61,4 @@ function construct_device!(
     model::DeviceModel{PSY.TModelHVDCLine, LossLessLine},
     ::NetworkModel{<:PM.AbstractActivePowerModel},
 )
-    devices = get_available_components(PSY.TModelHVDCLine, sys)
-    add_feedforward_constraints!(container, model, devices)
-    objective_function!(container, devices, model, get_network_formulation(network_model))
-    add_constraint_dual!(container, sys, model)
 end
diff --git a/src/devices_models/devices/AC_branches.jl b/src/devices_models/devices/AC_branches.jl
index 1176f83700..d7c8edc0cc 100644
--- a/src/devices_models/devices/AC_branches.jl
+++ b/src/devices_models/devices/AC_branches.jl
@@ -22,7 +22,7 @@ get_variable_binary(::FlowActivePowerVariable, ::Type{<:PSY.ACBranch}, ::Abstrac
 get_variable_binary(::PhaseShifterAngle, ::Type{PSY.PhaseShiftingTransformer}, ::AbstractBranchFormulation,) = false
 
 get_parameter_multiplier(::FixValueParameter, ::PSY.ACBranch, ::StaticBranch) = 1.0
-get_variable_multiplier(::PhaseShifterAngle, d::PSY.PhaseShiftingTransformer, ::PhaseAngleControl) = 1.0/PSY.get_x(d)
+get_variable_multiplier(::PhaseShifterAngle, ::PSY.PhaseShiftingTransformer, ::PhaseAngleControl) = 1.0/PSY.get_x(d)
 
 get_initial_conditions_device_model(::OperationModel, ::DeviceModel{T, <:AbstractBranchFormulation}) where {T <: PSY.ACBranch} = DeviceModel(T, StaticBranch)
 get_initial_conditions_device_model(::OperationModel, ::DeviceModel{T, <:AbstractBranchFormulation},) where {T <: PSY.MonitoredLine} = DeviceModel(T, StaticBranchUnbounded)
diff --git a/src/devices_models/devices/TwoTerminalDC_branches.jl b/src/devices_models/devices/TwoTerminalDC_branches.jl
index c29df3749f..7e31330919 100644
--- a/src/devices_models/devices/TwoTerminalDC_branches.jl
+++ b/src/devices_models/devices/TwoTerminalDC_branches.jl
@@ -19,6 +19,7 @@ get_variable_binary(
 
 get_variable_multiplier(::FlowActivePowerVariable, ::Type{<:PSY.TwoTerminalHVDCLine}, _) =
     NaN
+get_parameter_multiplier(::FixValueParameter, ::PSY.TwoTerminalHVDCLine, ::AbstractTwoTerminalDCLineFormulation) = 1.0
 
 get_variable_multiplier(
     ::FlowActivePowerFromToVariable,