Squashed commits of fixes and typos.