Fix errors created by commit 22c34fa