After testing with mongo cluster with aws.py settings, there are a few fixes