Fix remaining errors and typos.