More fixes for disabling DynamoDB.