Merge minor fixes from Trunk.

[SVN r85727]