Fix errors on loading