Fixing the build (again)