Fixing issues with refresh token