Some more T16 changes