Updated with latest emscripten incoming