Fix errors on last commit