Update code with botocore changes