Minor improvements for the update tool.
Merge pull request #950 from ngodfraind/master

Minor improvements for the update tool.