Minor changes.

Sorry for partial requests.