Fixing eyaml support