Fixed up some data structures