diff --git a/conf/type/__key_value/explorer/value b/conf/type/__key_value/explorer/value
index b1d7983f..3afc7cc5 100755
--- a/conf/type/__key_value/explorer/value
+++ b/conf/type/__key_value/explorer/value
@@ -21,7 +21,11 @@
 # Get the current value of key or __NOTSET__ if the key doesn't exist.
 #
 
-key="$(cat "$__object/parameter/key")"
+if [ -f "$__object/parameter/key" ]; then
+   key="$(cat "$__object/parameter/key")"
+else
+   key="$__object_id"
+fi
 file="$(cat "$__object/parameter/file")"
 delimiter="$(cat "$__object/parameter/delimiter")"
 
diff --git a/conf/type/__key_value/gencode-remote b/conf/type/__key_value/gencode-remote
index e41cd9b5..97da7349 100755
--- a/conf/type/__key_value/gencode-remote
+++ b/conf/type/__key_value/gencode-remote
@@ -41,7 +41,7 @@ DONE
             # change value
             cat << DONE
 awk -F "$delimiter" '
-/${key}${delimiter}*/{gsub(/$value_is/, $value_should)};{print}' "$file" > "${file}+" \
+/${key}${delimiter}*/{gsub(/$value_is/, "$value_should")};{print}' "$file" > "${file}+" \
 && mv "${file}+" "$file"
 
 DONE
diff --git a/conf/type/__package/manifest b/conf/type/__package/manifest
index 48818dd8..b331d32d 100755
--- a/conf/type/__package/manifest
+++ b/conf/type/__package/manifest
@@ -49,4 +49,4 @@ for property in $(ls .); do
    fi
 done
 
-__package_$type "$@"
+require="$__self" __package_$type "$@"
diff --git a/doc/changelog b/doc/changelog
index b599a52c..876a4f43 100644
--- a/doc/changelog
+++ b/doc/changelog
@@ -1,5 +1,7 @@
 1.7.1:
-	* Add explorers to reference documentation
+	* Documentation: Add explorers to reference
+	* Documentation: Typo cleanup (Derek Brost)
+	* Type __key_value: Bugfix (Steven Armstrong)
 
 1.7.0: 2011-05-10
 	* Bugfix type __package_yum: Fix redhat support (Ramon Salvadó)
diff --git a/doc/man/cdist-reference.text.sh b/doc/man/cdist-reference.text.sh
index c69ce977..14d5b55e 100755
--- a/doc/man/cdist-reference.text.sh
+++ b/doc/man/cdist-reference.text.sh
@@ -153,10 +153,11 @@ done
 
 cat << eof
 
+
 ENVIRONMENT VARIABLES
 ---------------------
 __explorer::
-   Directory that contains all explorers.
+   Directory that contains all global explorers.
    Available for: explorer
 __manifest::
    Directory that contains the initial manifest.