Minor mods for CTX team.