Fixed field extracting to be via getters.
Core changes with fixed bugs.