Fixes CommandT and Whitespace stripper