tweaks to support language-ecmascript