Fill some structs more correctly.