Fix errors, update method names