Token related fixes.