Attempt to fix some compilation errors.