Bridge: Fix some type inconsistencies.