Fix broken structs