various small fixes
Merge pull request #3826 from michaelcontento/emscripten-fixes

Various small Emscripten fixes