diff --git a/src/BiblioInfo.cpp b/src/BiblioInfo.cpp
index 2460c487d0..a50a865318 100644
--- a/src/BiblioInfo.cpp
+++ b/src/BiblioInfo.cpp
@@ -477,7 +477,7 @@ docstring BibTeXInfo::expandFormat(docstring const & format,
 	// to eventual attempts to convert LaTeX macros to unicode. See bug
 	// #8944. This is perhaps not the best solution, but it will have to
 	// do for now.
-	static size_t max_keysize = 128;
+	static size_t const max_keysize = 128;
 	odocstringstream ret; // return value
 	string key;
 	bool scanning_key = false;
diff --git a/src/BiblioInfo.h b/src/BiblioInfo.h
index 36750d80e2..1bd428c626 100644
--- a/src/BiblioInfo.h
+++ b/src/BiblioInfo.h
@@ -114,7 +114,7 @@ private:
 	/// be the one referenced in the crossref field.
 	docstring getValueForKey(std::string const & key, Buffer const & buf,
 		docstring const & before, docstring const & after, docstring const & dialog,
-		BibTeXInfo const * const xref, size_t maxsize = 1024) const;
+		BibTeXInfo const * const xref, size_t maxsize = 4096) const;
 	/// replace %keys% in a format string with their values
 	/// called from getInfo()
 	/// format strings may contain: