Fixes for TC-916