Fixes for latest emsripten