Fix some fallout from last commit