fixing token env issues