trilinos-precise: some upstream fixes