Fix errors from commit f0a169e.