Fixing up some token issues