fix up rivet migration