And fix the defconfig so it compiles again