Made additional changes to both Gateways.