Fix unexported struct members