Small fixes to Global Gateway