More changes to get vars to build properly.
More changes to get size_t right