Updates to work with new TriBITS.