Fixed all the compilation issues