modest tweaks to bridge infrastructure