Small improvements.

Very small improvements.