More small bug changes.