Merge minor fixes from Trunk.