fixes for multiple gateways on the same network