Lock down
Fix token util