Additional fixes token related changes