Update w.r.t. most recent sage