Fix access token issue
Small fixes