Fix missing includes and typos.