SapiService - token methods bugfixes