Fixes compilation errors
Fixes compilation errors