Fix typos and missed headers