Adapt to private struct fields being the default