Further minor fixes for emscripten support