Fix errors and more