diff --git a/pycqed/instrument_drivers/meta_instrument/HAL_Device.py b/pycqed/instrument_drivers/meta_instrument/HAL_Device.py
index 8ce0090bf..4d922c884 100644
--- a/pycqed/instrument_drivers/meta_instrument/HAL_Device.py
+++ b/pycqed/instrument_drivers/meta_instrument/HAL_Device.py
@@ -1436,8 +1436,8 @@ def measure_residual_ZZ_coupling(
 
         all_qubits = [q0] + q_spectators
         if prepare_for_timedomain:
-            self.prepare_for_timedomain(qubits=all_qubits, prepare_for_readout=False)
-            self.prepare_readout(qubits=[q0])
+            self.prepare_for_timedomain(qubits=all_qubits, prepare_for_readout=True)
+            self.prepare_readout(qubits=all_qubits)
         if MC is None:
             MC = self.instr_MC.get_instr()
 
@@ -1459,7 +1459,7 @@ def measure_residual_ZZ_coupling(
         )
 
         s = swf.OpenQL_Sweep(openql_program=p, CCL=self.instr_CC.get_instr())
-        d = self.get_int_avg_det(qubits=[q0])
+        d = self.get_int_avg_det(qubits=all_qubits)
         MC.set_sweep_function(s)
         MC.set_sweep_points(times_with_cal_points)
         MC.set_detector_function(d)
diff --git a/pycqed/measurement/openql_experiments/multi_qubit_oql.py b/pycqed/measurement/openql_experiments/multi_qubit_oql.py
index 18233c0a1..04a276e6d 100644
--- a/pycqed/measurement/openql_experiments/multi_qubit_oql.py
+++ b/pycqed/measurement/openql_experiments/multi_qubit_oql.py
@@ -545,7 +545,7 @@ def residual_coupling_sequence(
     # adding the calibration points
     p.add_multi_q_cal_points(
         qubits=all_qubits,
-        combinations=['0' * n_qubits, '1' * n_qubits])
+        combinations=['0' * n_qubits, '0' * n_qubits, '1' * n_qubits, '1' * n_qubits])
 
     p.compile()
     return p