Modified structures to use size_t where it corresponded