Needing help with TB 31.x bugs