Fix YAML 'gateway' option