fix the compilation issues