Fixes to catch up tcr-colonyjit branch.