diff --git a/.pylintdict b/.pylintdict
index 9230a0687..b667eec08 100644
--- a/.pylintdict
+++ b/.pylintdict
@@ -109,6 +109,7 @@ leq
 lhs
 lin
 linearconstraint
+linexpr
 lowerbound
 lp
 lucas
@@ -174,6 +175,7 @@ qn
 qp
 qrac
 qrao
+quadexpr
 quadratically
 quadraticconstraint
 quadraticobjective
diff --git a/qiskit_optimization/algorithms/grover_optimizer.py b/qiskit_optimization/algorithms/grover_optimizer.py
index 9f84d64b9..469ebce18 100644
--- a/qiskit_optimization/algorithms/grover_optimizer.py
+++ b/qiskit_optimization/algorithms/grover_optimizer.py
@@ -1,6 +1,6 @@
 # This code is part of a Qiskit project.
 #
-# (C) Copyright IBM 2020, 2023.
+# (C) Copyright IBM 2020, 2024.
 #
 # This code is licensed under the Apache License, Version 2.0. You may
 # obtain a copy of this license in the LICENSE.txt file in the root directory
@@ -165,6 +165,8 @@ def solve(self, problem: QuadraticProgram) -> OptimizationResult:
         # Variables for result object.
         operation_count = {}
         iteration = 0
+        samples = None
+        raw_samples = None
 
         # Variables for stopping if we've hit the rotation max.
         rotations = 0
diff --git a/qiskit_optimization/algorithms/qrao/magic_rounding.py b/qiskit_optimization/algorithms/qrao/magic_rounding.py
index d4e962089..bc867a800 100644
--- a/qiskit_optimization/algorithms/qrao/magic_rounding.py
+++ b/qiskit_optimization/algorithms/qrao/magic_rounding.py
@@ -130,7 +130,7 @@ def _make_circuits(
                 qc = circuit.compose(_z_to_31p_qrac_basis_circuit(basis).inverse(), inplace=False)
             elif vars_per_qubit == 2:
                 qc = circuit.compose(_z_to_21p_qrac_basis_circuit(basis).inverse(), inplace=False)
-            elif vars_per_qubit == 1:
+            else:
                 qc = circuit.copy()
             qc.measure_all()
             circuits.append(qc)
diff --git a/qiskit_optimization/translators/gurobipy.py b/qiskit_optimization/translators/gurobipy.py
index f0f3e3bde..bc9978bcc 100644
--- a/qiskit_optimization/translators/gurobipy.py
+++ b/qiskit_optimization/translators/gurobipy.py
@@ -1,6 +1,6 @@
 # This code is part of a Qiskit project.
 #
-# (C) Copyright IBM 2021, 2023.
+# (C) Copyright IBM 2021, 2024.
 #
 # This code is licensed under the Apache License, Version 2.0. You may
 # obtain a copy of this license in the LICENSE.txt file in the root directory
@@ -33,6 +33,20 @@ class Model:  # type: ignore
 
         pass
 
+    class LinExpr:  # type: ignore
+        """Empty LinExpr class
+        Replacement if gurobipy.LinExpr is not present.
+        """
+
+        pass
+
+    class QuadExpr:  # type: ignore
+        """Empty QuadExpr class
+        Replacement if gurobipy.QuadExpr is not present.
+        """
+
+        pass
+
 
 @_optionals.HAS_GUROBIPY.require_in_call
 def to_gurobipy(quadratic_program: QuadraticProgram) -> Model: