Fixed a few typos and warnings on code composition.