Fix up recent op/stat.t failures