Fix errors of the last commit