diff --git a/artiq/coredevice/dac34h84.py b/artiq/coredevice/dac34h84.py
index 155096a1e..e421851a7 100644
--- a/artiq/coredevice/dac34h84.py
+++ b/artiq/coredevice/dac34h84.py
@@ -178,7 +178,8 @@ class DAC34H84:
             (self.collisiongone_ena << 12) | (self.sif4_ena << 7) |
             (self.mixer_ena << 6) | (self.mixer_gain << 5) |
             (self.nco_ena << 4) | (self.revbus << 3) | (self.twos << 1))
-        mmap.append((0x03 << 16) | (self.coarse_dac << 12) | (self.sif_txenable << 0))
+        mmap.append((0x03 << 16) | (self.coarse_dac << 12) |
+                    (self.sif_txenable << 0))
         mmap.append(
             (0x07 << 16) |
             (self.mask_alarm_from_zerochk << 15) | (1 << 14) |
diff --git a/artiq/coredevice/phaser.py b/artiq/coredevice/phaser.py
index d5acf6501..604649a09 100644
--- a/artiq/coredevice/phaser.py
+++ b/artiq/coredevice/phaser.py
@@ -1,6 +1,8 @@
+from numpy import int32, int64
+
 from artiq.language.core import kernel, delay_mu, delay
 from artiq.coredevice.rtio import rtio_output, rtio_input_data
-from artiq.language.units import us, ns, ms, MHz, dB
+from artiq.language.units import us, ns, ms, MHz
 from artiq.language.types import TInt32
 from artiq.coredevice.dac34h84 import DAC34H84
 from artiq.coredevice.trf372017 import TRF372017
diff --git a/artiq/coredevice/trf372017.py b/artiq/coredevice/trf372017.py
index 40957db86..75c153997 100644
--- a/artiq/coredevice/trf372017.py
+++ b/artiq/coredevice/trf372017.py
@@ -92,9 +92,10 @@ class TRF372017:
             (self.cal_clk_sel << 27))
         mmap.append(
             0xa |
-            (self.ndiv << 5) | (self.pll_div_sel << 21) | (self.prsc_sel << 23) |
-            (self.vco_sel << 26) | (self.vcosel_mode << 28) |
-            (self.cal_acc << 29) | (self.en_cal << 31))
+            (self.ndiv << 5) | (self.pll_div_sel << 21) |
+            (self.prsc_sel << 23) | (self.vco_sel << 26) |
+            (self.vcosel_mode << 28) | (self.cal_acc << 29) |
+            (self.en_cal << 31))
         mmap.append(0xb | (self.nfrac << 5))
         mmap.append(
             0xc |