WIP: Missed a few fields in pod refactor

Oh, I know.  I wrote that in my comment above.  It will come out before this is merged.