Merged emscripten port work