Fix deprecated accessors