Fix class variable setters