diff --git a/btree_validator.h b/btree_validator.h
index 7fa4843..3a19e2f 100644
--- a/btree_validator.h
+++ b/btree_validator.h
@@ -27,10 +27,8 @@ namespace persistent_data {
 			count_map::iterator it = counts_.find(b);
 			if (it == counts_.end())
 				counts_.insert(make_pair(b, 1));
-#if 0
 			else
 				it->second++;
-#endif
 		}
 
 		unsigned get_count(block_address b) const {
diff --git a/metadata.cc b/metadata.cc
index 3077d51..9f7e6ad 100644
--- a/metadata.cc
+++ b/metadata.cc
@@ -374,12 +374,10 @@ metadata::check()
 
 	mapping_validator::ptr mv(new mapping_validator(metadata_counter,
 							data_counter));
-	metadata_counter.inc(mappings_.get_root());
 	mappings_.visit(mv);
 	set<uint64_t> const &mapped_devs = mv->get_devices();
 
 	details_validator::ptr dv(new details_validator(metadata_counter));
-	metadata_counter.inc(details_.get_root());
 	details_.visit(dv);
 	set<uint64_t> const &details_devs = dv->get_devices();
 
diff --git a/space_map_disk.h b/space_map_disk.h
index 22c61c9..395c03f 100644
--- a/space_map_disk.h
+++ b/space_map_disk.h
@@ -245,7 +245,6 @@ namespace persistent_data {
 
 			virtual void check(block_counter &counter) const {
 				typename ref_count_validator<BlockSize>::ptr v(new ref_count_validator<BlockSize>(counter));
-				counter.inc(ref_counts_.get_root());
 				ref_counts_.visit(v);
 			}
 
@@ -441,7 +440,8 @@ namespace persistent_data {
 
 				counter.inc(bitmap_root_);
 				for (unsigned i = 0; i < entries_.size(); i++)
-					counter.inc(entries_[i].blocknr_);
+					if (entries_[i].blocknr_ != 0) // superblock
+						counter.inc(entries_[i].blocknr_);
 			}
 
 		private: