Fix fatal errors introduced by an earlier PR.