Tristan fixes