TCUI small fixes