Fix support for EcmaScript modules