Fix some typos and clean up includes