2.0: Fix errors