diff --git a/hyrax/app/models/collection.rb b/hyrax/app/models/collection.rb
index 83eceab71bd921e06473a2a4a330bb871a212582..187241047f93dc204913fbdf9cf47d36fc97568a 100644
--- a/hyrax/app/models/collection.rb
+++ b/hyrax/app/models/collection.rb
@@ -13,6 +13,16 @@ class Collection < ActiveFedora::Base
 
   include Hyrax::BasicMetadata
 
+  def after_update_nested_collection_relationship_indices
+    @during_save = false
+    reindex_nested_relationships_for(id: id, extent: Hyrax::Adapters::NestingIndexAdapter::LIMITED_REINDEX)
+  end
+
+  def update_nested_collection_relationship_indices
+    return if @during_save
+    reindex_nested_relationships_for(id: id, extent: Hyrax::Adapters::NestingIndexAdapter::LIMITED_REINDEX)
+  end
+
   def manager_role
     Role.find_by_name("#{collection_type.title.parameterize(separator: '_')}_manager")
   end
diff --git a/hyrax/app/models/concerns/external_services.rb b/hyrax/app/models/concerns/external_services.rb
index c2360137509afe5a61e9bcfee7f840095fcfd840..c3c46b7477ba95636ad2c13467777fbeb9cffec5 100644
--- a/hyrax/app/models/concerns/external_services.rb
+++ b/hyrax/app/models/concerns/external_services.rb
@@ -58,8 +58,8 @@ module ExternalServices
 
         if s3.bucket_exists?(bucket_name)
           list_of_objects, total_size, list_of_format = s3.list_all_objects(bucket_name, nil, true)
-          return true if (self.format == list_of_format && self.files_size == [total_size])
-          self.files_size = [total_size]
+          return true if (self.format == list_of_format && self.files_size.first.to_i == total_size)
+          self.files_size = [total_size.to_s]
           self.format = list_of_format
           self.date_modified = DateTime.now
         end
diff --git a/hyrax/app/models/concerns/s3_file_handleable.rb b/hyrax/app/models/concerns/s3_file_handleable.rb
index 0cc54d750ba8a5581e384ce5d4b32321eaead9fa..9b21102339fa9161d5a9fc767c0ed9ea96ae1f69 100644
--- a/hyrax/app/models/concerns/s3_file_handleable.rb
+++ b/hyrax/app/models/concerns/s3_file_handleable.rb
@@ -58,7 +58,7 @@ module S3FileHandleable
     s3service.init_client
     bucket_name = s3service.sanitise_name(crc_dataset.id)
     list_of_objects, total_size, list_of_format = s3service.list_all_objects(bucket_name, nil, true)
-    crc_dataset.update(date_modified: DateTime.now, files_size: [total_size], format:list_of_format)
+    crc_dataset.update(date_modified: DateTime.now, files_size: [total_size.to_s], format:list_of_format)
   end
 
 
diff --git a/hyrax/app/models/crc_dataset.rb b/hyrax/app/models/crc_dataset.rb
index 5e9c5f4fd50d860448c14e320bb91b019d88250d..1402166c0ddcfd522132e81fdd2d5877d9a9dbb5 100755
--- a/hyrax/app/models/crc_dataset.rb
+++ b/hyrax/app/models/crc_dataset.rb
@@ -100,7 +100,6 @@ class CrcDataset < ActiveFedora::Base
   end
 
   property :files_size, predicate: ::RDF::Vocab::Rdms.size do |index|
-    index.type :integer
     index.as :stored_searchable
   end
 
diff --git a/hyrax/app/models/dataset.rb b/hyrax/app/models/dataset.rb
index 793d4f40800612380c871b9eaa981daa9c65d8ea..ea13b84cc960323a33ae003f18535af6439ea97f 100755
--- a/hyrax/app/models/dataset.rb
+++ b/hyrax/app/models/dataset.rb
@@ -101,7 +101,6 @@ class Dataset < ActiveFedora::Base
   end
 
   property :files_size, predicate: ::RDF::Vocab::Rdms.size do |index|
-    index.type :integer
     index.as :stored_searchable
   end
   
diff --git a/hyrax/app/views/hyrax/base/_download_all.html.erb b/hyrax/app/views/hyrax/base/_download_all.html.erb
index eb4d312e779b150b68010d58d623885498663709..a9ddda30707dd07c510feb2468ca6195d937ee4b 100644
--- a/hyrax/app/views/hyrax/base/_download_all.html.erb
+++ b/hyrax/app/views/hyrax/base/_download_all.html.erb
@@ -1,5 +1,5 @@
 <div class="download-all">
-  <% total_size = (@crc_dataset || @dataset).files_size.first || 0 %>
+  <% total_size = (@crc_dataset || @dataset).files_size.first.presence.to_i %>
   <% message = total_size < ENV.fetch('DOWNLOAD_FILES_SIZE_LIMIT', '100000000').to_i ? '.zip_file_message' : '.shell_file_message' %>
   <%= link_to t(:'hyrax.download_all'), main_app.download_all_path(presenter.id), disabled: download_all_button_available?(presenter.id) ? false : true, id: "download-all", class: "btn btn-default matomo_download", data:{ document_id: presenter.id } %>
   <span class="fa fa-info-circle download-info" data-toggle="tooltip" title="<%= t("#{message}", size: total_size.to_s(:human_size))%>" aria-hidden="true"></span>