Fix errors causing tests to fail