rebuild some structs