Fix errors let by previous commit