FTT-94 fixes per code review