Add changes to fix deleteIndexes() and drop() collection issues