Adjust Compiler and Tokenizer