Fixes to Gateways