A few more fixes due to moving functions around.