More fixes for failing tests.