diff --git a/src/frontends/qt3/QDocument.C b/src/frontends/qt3/QDocument.C
index dbb20e0165..82262b1e1d 100644
--- a/src/frontends/qt3/QDocument.C
+++ b/src/frontends/qt3/QDocument.C
@@ -688,6 +688,11 @@ void QDocument::update_contents()
 	if (n >= 0)
 		dialog_->fontModule->fontsDefaultCO->setCurrentItem(n);
 
+	// paper
+	int const psize = params.papersize;
+	dialog_->pageLayoutModule->papersizeCO->setCurrentItem(psize);
+	dialog_->setCustomPapersize(psize);
+
 	// margins
 	MarginsModuleBase * m = dialog_->marginsModule;
 
diff --git a/src/frontends/xforms/FormDocument.C b/src/frontends/xforms/FormDocument.C
index 1d0721f0c6..27d6348627 100644
--- a/src/frontends/xforms/FormDocument.C
+++ b/src/frontends/xforms/FormDocument.C
@@ -60,7 +60,7 @@ namespace lyx {
 
 using support::bformat;
 using support::contains;
-using lyx::support::findToken;
+using support::findToken;
 using support::getStringFromVector;
 using support::getVectorFromString;
 using support::libFileSearch;