Fix compiler errors introduced by commit 54a4cf632ae16214fcfcee982e4cf98b04f516b6.