diff --git a/src/BloomFilter.cc b/src/BloomFilter.cc
index 74fa6fb255..e549553bf4 100644
--- a/src/BloomFilter.cc
+++ b/src/BloomFilter.cc
@@ -140,7 +140,7 @@ bool BloomFilter::DoUnserialize(UnserialInfo* info)
 	  return false;
 	hash_ = new hash_policy(static_cast<size_t>(k));
 	uint64 elements;
-  if ( UNSERIALIZE(&elements) )
+  if ( ! UNSERIALIZE(&elements) )
     return false;
   elements_ = static_cast<size_t>(elements);
 	return true;
diff --git a/src/BloomFilter.h b/src/BloomFilter.h
index 14b0ac3281..3e2bd5de90 100644
--- a/src/BloomFilter.h
+++ b/src/BloomFilter.h
@@ -94,15 +94,14 @@ protected:
    * A functor that computes a universal hash function.
    * @tparam Codomain An integral type.
    */
-  template <typename Codomain = HashType>
   class Hasher {
   public:
-    template <typename Domain>
-    Codomain operator()(const Domain& x) const
+    template <typename T>
+    HashType operator()(const T& x) const
       {
       return h3_(&x, sizeof(x));
       }
-    Codomain operator()(const void* x, size_t n) const
+    HashType operator()(const void* x, size_t n) const
       {
       return h3_(x, n);
       }
@@ -110,7 +109,7 @@ protected:
     // FIXME: The hardcoded value of 36 comes from UHASH_KEY_SIZE defined in
     // Hash.h. I do not know how this value impacts the hash function behavior
     // so I'll just copy it verbatim. (Matthias)
-    H3<Codomain, 36> h3_;
+    H3<HashType, 36> h3_;
   };
 
   HashPolicy(size_t k) : k_(k) { }
@@ -125,12 +124,11 @@ private:
 class DefaultHashing : public HashPolicy {
 public:
   DefaultHashing(size_t k) : HashPolicy(k), hashers_(k) { }
-  virtual ~DefaultHashing() { }
 
   virtual HashVector Hash(const void* x, size_t n) const;
 
 private:
-  std::vector< Hasher<HashType> > hashers_;
+  std::vector<Hasher> hashers_;
 };
 
 /**
@@ -139,13 +137,12 @@ private:
 class DoubleHashing : public HashPolicy {
 public:
   DoubleHashing(size_t k) : HashPolicy(k) { }
-  virtual ~DoubleHashing() { }
 
   virtual HashVector Hash(const void* x, size_t n) const;
 
 private:
-  Hasher<HashType> hasher1_;
-  Hasher<HashType> hasher2_;
+  Hasher hasher1_;
+  Hasher hasher2_;
 };
 
 /**
diff --git a/src/OpaqueVal.cc b/src/OpaqueVal.cc
index abfd8f320f..03a6e51ce8 100644
--- a/src/OpaqueVal.cc
+++ b/src/OpaqueVal.cc
@@ -533,6 +533,7 @@ bool BloomFilterVal::Typify(BroType* type)
   if ( type_ )
     return false;
   type_ = type;
+  type_->Ref();
   TypeList* tl = new TypeList(type_);
   tl->Append(type_);
   hash_ = new CompositeHash(tl);