Added s3/aws checks