Fixed the compilation erros