Changes for emscripten build