More fixes, two tests are failing