T8 fixes, checks