Merge "Fix warnings in Bridge"