Merge "Fix some FileOpBatch IDEA errors"