T15/16 Fixes