More ts3 fixes