Fixed the rest of the errors regarding switching tokenization to take place on the client only