Additional work on Emscripten

This is actually work on just getting it to build with clang, let along emcc
Another clang fix