Fixed some thinkos/typos.
Merged fixes.