Backfill 6.1 b2 stdlib changes