Tristan fix issues

Nice