Some fixes to get tri-Star build/test working.