Fixing the compilation problems.