Fixes for Trilinos ETI

With this fix and my recent commits to Trilinos to enable <double,int,long>, it is now possible to build Trilinos with ETI on.