Fix fatal errors when flag_token_info() is called
Merge branch 'token' into allFixes