Update Rivets—fix all the bugs!