Fix arrays and structs