Fix bugs in backfill, make backfill toggleable.