Fix some things from a recent refactor.