fixes related to access tokens