Fix unmatching calls to consumes and getByToken