diff --git a/docker/finn_entrypoint.sh b/docker/finn_entrypoint.sh
index 7de26d8e46b128b62bf6f1ab58bc04f7bda4bc6e..5adf0048eb1fa7f9cf777d583d8fe31673e465df 100644
--- a/docker/finn_entrypoint.sh
+++ b/docker/finn_entrypoint.sh
@@ -12,7 +12,7 @@ gecho () {
 
 # checkout the correct dependency repo commits
 # the repos themselves are cloned in the Dockerfile
-FINN_BASE_COMMIT=eebb2e4053a46ae314c13ee91657c3b82cd93b24
+FINN_BASE_COMMIT=a21a581ecba8db1b86f8e1f96d2d841a0992a2d6
 BREVITAS_COMMIT=6ffefa8dbf37fdb0f44c994f34604c29fadb16b0
 CNPY_COMMIT=4e8810b1a8637695171ed346ce68f6984e585ef4
 HLSLIB_COMMIT=cfafe11a93b79ab1af7529d68f08886913a6466e
diff --git a/src/finn/custom_op/fpgadataflow/__init__.py b/src/finn/custom_op/fpgadataflow/__init__.py
index a3b6a8ff6a1395cebf1e37e9f408eb3833dfaaac..d093a410e5b30a039688ec1a5264e59b92edfd8a 100644
--- a/src/finn/custom_op/fpgadataflow/__init__.py
+++ b/src/finn/custom_op/fpgadataflow/__init__.py
@@ -34,7 +34,7 @@ from abc import abstractmethod
 import numpy as np
 import os
 import subprocess
-from finn.custom_op.custom_op import CustomOp
+from finn.custom_op.base import CustomOp
 from finn.util.basic import (
     CppBuilder,
     make_build_dir,