bridge fixes