A few fixes in Trilinos.