And fix the compilation on <4.02