TRAIL fixes