Fix replaced accessors & mutators