Add missing header, fix some typos