support for no AWS account and Anna's bug fix