Minor fixes to Tempest's Custom TC