Fixes to Utoken environment usage