Address static analysis issues.
Merge branch 'master' of https://github.com/AceRoqs/DiskTools