Fix language issues found by Florian Loitsch. Fix asm.js issue pointed by James Long.