Trivial misc bridge code changes.