Fixes for TC-913, TC-914, and TC-916