Some CommandT mods