Setter / getter error fixes