Fixes to allow for backfilling