Fix various makefile boo-boos and update emscripten sub