Fix all the things I broke in the express upgrade.