Fixing compilation errors
Fixing compilation errors