Fix for tokenizer + using mvn parallel build.