Minor improvements.

MFC after:	1 week