Fix for compilation errors