Tristan misc fixes