Dev several token related fixes.