[FT] Minor changes