WIP: Missed a few fields in pod refactor

This isn't really something we want to do I don't think.