Fix the build

Let's hope we had no regressions in the mean time