Fixed token issues