Compilation errors fixes