Some struct fields were erroneusly made private