Typo fix and typedefs for the structs.