fix some underlying circular references that were giving us 500 internal server errors on json serialize