Fix eyaml keys