Fix tivi functions