Small fixes in tools.

Change-Id: I8373393cf017458e7bf9d8aa0adef1ab9eafd2bd
2 files changed