Fix some missing flags from tools in JSON
Merge remote-tracking branch 'dda/pr/936' into dda-master