Fix and backfill specs