Fix populating bridge-tools.