Adding minor upstream changes.