Changes to get more tests to succeed.