small fixes
Merge branch 'emcc' of https://github.com/JoakimBlomberg/moai-dev into emcc