fix token calls to aws.Token