Fix things that made tests fail from last checkin.