Trying to fix compilation errors.