Really fixes to class flags now.