Series: fix up errors from running upgrade script.