Changes to make tests pass.