Find pointers in structs and create global arrays
Two small fixes