diff --git a/tangostationcontrol/tangostationcontrol/devices/sdp/beamlet.py b/tangostationcontrol/tangostationcontrol/devices/sdp/beamlet.py
index 8014dd5c7e1c247f8df5934b31008ea8908420b0..9b72ce655249770b84b99a9b43ce2777f84f785e 100644
--- a/tangostationcontrol/tangostationcontrol/devices/sdp/beamlet.py
+++ b/tangostationcontrol/tangostationcontrol/devices/sdp/beamlet.py
@@ -140,7 +140,7 @@ class Beamlet(opcua_device):
 
     # cint16[N_PN][N_POL_BF][A_PN][N_POL][N_BEAMLETS_CTRL]
     # Full Jones matrix of BF weights.
-    FPGA_bf_weights_xx_xy_yx_yy_R = attribute_wrapper(comms_annotation=["FPGA_bf_weights_xx_xy_yx_yy_R"], datatype=numpy.uint32, dims=(N_POL_BF * A_PN * N_pol * N_BEAMLETS_CTRL, N_PN))
+    FPGA_bf_weights_xx_xy_yx_yy_R = attribute_wrapper(comms_annotation=["FPGA_bf_weights_xx_xy_yx_yy_R"], datatype=numpy.uint32, dims=(N_POL_BF * A_PN * N_POL * N_BEAMLETS_CTRL, N_PN))
     FPGA_bf_weights_xx_xy_yx_yy_RW = attribute_wrapper(comms_annotation=["FPGA_bf_weights_xx_xy_yx_yy_RW"], datatype=numpy.uint32, dims=(N_POL_BF * A_PN * N_POL * N_BEAMLETS_CTRL, N_PN), access=AttrWriteType.READ_WRITE)
 
     # cint16[N_PN][A_PN][N_BEAMLETS_CTRL]
diff --git a/tangostationcontrol/tangostationcontrol/test/clients/test_tcp_replicator.py b/tangostationcontrol/tangostationcontrol/test/clients/test_tcp_replicator.py
index 04c87f1d5a15705f7d0b8ce1460141255cb02b27..03a1c3b10eff18625cdaeccd869874b85e8748c1 100644
--- a/tangostationcontrol/tangostationcontrol/test/clients/test_tcp_replicator.py
+++ b/tangostationcontrol/tangostationcontrol/test/clients/test_tcp_replicator.py
@@ -61,7 +61,7 @@ class TestTCPReplicator(base.TestCase):
         """Validate option parsing"""
 
         # Perform string copy of current tcp_bind value
-        t_tcp_bind = str(TCPReplicator._default_options['tcp_bind'])
+        t_tcp_bind = str(TCPReplicator._DEFAULT_OPTIONS['tcp_bind'])
 
         test_options = {
             "random": 12346,    # I should be ignored
@@ -72,7 +72,7 @@ class TestTCPReplicator(base.TestCase):
         self.assertTrue(replicator.is_alive())
 
         # Ensure replicator initialization does not modify static variable
-        self.assertEqual(t_tcp_bind, TCPReplicator._default_options['tcp_bind'])
+        self.assertEqual(t_tcp_bind, TCPReplicator._DEFAULT_OPTIONS['tcp_bind'])
 
         # Ensure options are correctly updated upon initialization
         self.assertEqual(test_options['tcp_bind'], replicator.options['tcp_bind'])