Small fixes in backfilling support