[FIXUP] couple small corrections to new sage-upgrade