Compilations errors fixed