Minor improvements all over the place.