Fixed the compilations errors