Latest fixes to emscripten