Tracevis: more fixes to waterfall transition