Minimal changes required for the data to show up in places and not cause segfaults.