Apply corrections from Tristan.