diff --git a/Pipfile b/Pipfile
index c12f1d9702..0b22be23f0 100644
--- a/Pipfile
+++ b/Pipfile
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ed6317ab27aa006250dc03372865b0a48e86cdf3060ad75206df3b6c22a00559
-size 1398
+oid sha256:08a5ff9631cfadc63a5c7ebdf227eb390cafab2e3af77554b2a41005a618ac31
+size 1410
diff --git a/Pipfile.lock b/Pipfile.lock
index e990d6e946..e2767a418c 100644
--- a/Pipfile.lock
+++ b/Pipfile.lock
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e5214ea7672333a1ac7a11010f7f99c97f2f47a3b8347f655e3197558cd88b9a
-size 138292
+oid sha256:ff47c83e09bd8030db7c4c7ba64f2db52c22af9003414ef09acbcc25c92ffa3b
+size 141871
diff --git a/selfdrive/car/interfaces.py b/selfdrive/car/interfaces.py
index 34ca75cd48..ddf67e4d62 100644
--- a/selfdrive/car/interfaces.py
+++ b/selfdrive/car/interfaces.py
@@ -63,9 +63,8 @@ class CarInterfaceBase(ABC):
     # TODO: something with lateralPlan.curvatureRates
     return desired_angle * (v_ego**2)
 
-  @classmethod
-  def get_steer_feedforward_function(cls):
-    return cls.get_steer_feedforward_default
+  def get_steer_feedforward_function(self):
+    return self.get_steer_feedforward_default
 
   # returns a set of default params to avoid repetition in car specific params
   @staticmethod
diff --git a/selfdrive/debug/internal/power_monitor.py b/selfdrive/debug/internal/power_monitor.py
index c995ef6ff2..09fb89835b 100755
--- a/selfdrive/debug/internal/power_monitor.py
+++ b/selfdrive/debug/internal/power_monitor.py
@@ -10,6 +10,7 @@ def average(avg, sample):
 
 
 if __name__ == '__main__':
+  start_time = datetime.now()
   try:
     if len(sys.argv) > 1 and sys.argv[1] == "--charge":
       print("not disabling charging")
@@ -22,7 +23,6 @@ if __name__ == '__main__':
     power_average = (0., 0)
     capacity_average = (0., 0)
     bat_temp_average = (0., 0)
-    start_time = datetime.now()
     while 1:
       with open("/sys/class/power_supply/bms/voltage_now") as f:
         voltage = int(f.read()) / 1e6   # volts
diff --git a/selfdrive/test/test_onroad.py b/selfdrive/test/test_onroad.py
index f1f540dad1..d6d9f49bca 100755
--- a/selfdrive/test/test_onroad.py
+++ b/selfdrive/test/test_onroad.py
@@ -154,6 +154,7 @@ class TestOnroad(unittest.TestCase):
     os.system("pkill -9 -f athena")
 
     # start manager and run openpilot for a minute
+    proc = None
     try:
       manager_path = os.path.join(BASEDIR, "selfdrive/manager/manager.py")
       proc = subprocess.Popen(["python", manager_path])
@@ -182,9 +183,10 @@ class TestOnroad(unittest.TestCase):
       cls.segments = cls.segments[:-1]
 
     finally:
-      proc.terminate()
-      if proc.wait(60) is None:
-        proc.kill()
+      if proc is not None:
+        proc.terminate()
+        if proc.wait(60) is None:
+          proc.kill()
 
     cls.lrs = [list(LogReader(os.path.join(str(s), "rlog.bz2"))) for s in cls.segments]