4 files changed, 10 insertions, 4 deletions
diff --git a/src/Hakyll/Core/Provider/Internal.hs b/src/Hakyll/Core/Provider/Internal.hs
index 583c665..d566f3a 100644
--- a/src/Hakyll/Core/Provider/Internal.hs
+++ b/src/Hakyll/Core/Provider/Internal.hs
@@ -98,7 +98,7 @@ data Provider = Provider
       providerOldFiles  :: Map Identifier ResourceInfo
     , -- | Underlying persistent store for caching
       providerStore     :: Store
-    }
+    } deriving (Show)
 
 
 --------------------------------------------------------------------------------
diff --git a/src/Hakyll/Core/Provider/Metadata.hs b/src/Hakyll/Core/Provider/Metadata.hs
index fe2857a..7e4d7ed 100644
--- a/src/Hakyll/Core/Provider/Metadata.hs
+++ b/src/Hakyll/Core/Provider/Metadata.hs
@@ -44,8 +44,9 @@ loadMetadata p identifier = do
 
     return (M.union md emd, body)
   where
-    fp  = resourceFilePath p identifier
-    mi  = M.lookup identifier (providerFiles p) >>= resourceInfoMetadata
+    normal = setVersion Nothing identifier
+    fp     = resourceFilePath p identifier
+    mi     = M.lookup normal (providerFiles p) >>= resourceInfoMetadata
 
 
 --------------------------------------------------------------------------------
diff --git a/src/Hakyll/Core/Store.hs b/src/Hakyll/Core/Store.hs
index 74d9d2f..5c3667d 100644
--- a/src/Hakyll/Core/Store.hs
+++ b/src/Hakyll/Core/Store.hs
@@ -50,6 +50,11 @@ data Store = Store
 
 
 --------------------------------------------------------------------------------
+instance Show Store where
+    show _ = "<Store>"
+
+
+--------------------------------------------------------------------------------
 -- | Result of a store query
 data Result a
     = Found a                    -- ^ Found, result
diff --git a/src/Hakyll/Web/Template/Context.hs b/src/Hakyll/Web/Template/Context.hs
index 98662dd..cd52eb0 100644
--- a/src/Hakyll/Web/Template/Context.hs
+++ b/src/Hakyll/Web/Template/Context.hs
@@ -130,7 +130,7 @@ bodyField key = field key $ return . itemBody
 
 --------------------------------------------------------------------------------
 -- | Map any field to its metadata value, if present
-metadataField :: Context String
+metadataField :: Context a
 metadataField = Context $ \k i -> do
     value <- getMetadataField (itemIdentifier i) k
     maybe empty (return . StringField) value