Minor changes to make sure tests pass.