Fix errors on 404