diff --git a/Data/Generics/Uniplate/Internal/Data.hs b/Data/Generics/Uniplate/Internal/Data.hs
--- a/Data/Generics/Uniplate/Internal/Data.hs
+++ b/Data/Generics/Uniplate/Internal/Data.hs
@@ -87,7 +87,7 @@
 -- GHC 7.2 and above (using unordered-containers API)
 
 (!) mp k = Map.lookupDefault (error "Could not find element") k mp
-map_findWithDefault = Map.lookupDefault
+map_findWithDefault d k mp = fromMaybe d $ Map.lookup k mp -- in 0.2.3.0 lookupDefault is strict in the default :(
 map_fromAscList = Map.fromList
 map_keysSet = Set.fromList . Map.keys
 map_member x xs = isJust $ Map.lookup x xs
diff --git a/Data/Generics/Uniplate/Internal/OperationsInc.hs b/Data/Generics/Uniplate/Internal/OperationsInc.hs
--- a/Data/Generics/Uniplate/Internal/OperationsInc.hs
+++ b/Data/Generics/Uniplate/Internal/OperationsInc.hs
@@ -197,7 +197,6 @@
 
 -- | Return the children of a type. If @to == from@ then it returns the
 -- original element (in contrast to 'children')
--- FIXME: Was confusing to Roman
 childrenBi :: Biplate from to => from -> [to]
 childrenBi x = builder f
     where
diff --git a/uniplate.cabal b/uniplate.cabal
--- a/uniplate.cabal
+++ b/uniplate.cabal
@@ -1,7 +1,7 @@
 cabal-version:      >= 1.6
 build-type:         Simple
 name:               uniplate
-version:            1.6.9
+version:            1.6.10
 author:             Neil Mitchell <ndmitchell@gmail.com>
 maintainer:         Neil Mitchell <ndmitchell@gmail.com>
 copyright:          Neil Mitchell 2006-2012
@@ -56,7 +56,7 @@
     if flag(typeable_fingerprint)
         build-depends:
             base >=4.4 && <5, containers, syb,
-            hashable >= 1.1.2.3 && < 1.2,
+            hashable >= 1.1.2.3 && < 1.3,
             unordered-containers >= 0.2.1 && < 0.3
     else
         if flag(separate_syb)