Small fixes, typos etc.

@jhlch. @lsheng.