Correct few typos
Merge branch 'nomodule'