minor edits to align with trunk.