Fix backfill problems.