diff --git a/builtin-pack-refs.c b/builtin-pack-refs.c
index ede47434e3..23d0d0720e 100644
--- a/builtin-pack-refs.c
+++ b/builtin-pack-refs.c
@@ -89,6 +89,7 @@ int cmd_pack_refs(int argc, const char **argv, const char *prefix)
 		die("unable to create ref-pack file structure (%s)",
 		    strerror(errno));
 	for_each_ref(handle_one_ref, &cbdata);
+	fflush(cbdata.refs_file);
 	fsync(fd);
 	fclose(cbdata.refs_file);
 	if (commit_lock_file(&packed) < 0)
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index 785e6fb66c..bfd1405a00 100755
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -124,6 +124,10 @@ sub gitweb_check_feature {
 		$feature{$name}{'override'},
 		@{$feature{$name}{'default'}});
 	if (!$override) { return @defaults; }
+	if (!defined $sub) {
+		warn "feature $name is not overrideable";
+		return @defaults;
+	}
 	return $sub->(@defaults);
 }