diff --git a/frontend/document/credocument.lua b/frontend/document/credocument.lua
index a17da20bd..f7ab6d6f0 100644
--- a/frontend/document/credocument.lua
+++ b/frontend/document/credocument.lua
@@ -127,7 +127,6 @@ function CreDocument:loadDocument()
 end
 
 function CreDocument:close()
-    self._document:saveDefaults()
     Document.close(self)
 end
 
@@ -335,13 +334,17 @@ function CreDocument:setStyleSheet(new_css)
 end
 
 function CreDocument:setEmbeddedStyleSheet(toggle)
+    -- FIXME: occasional segmentation fault when switching embedded style sheet
     DEBUG("CreDocument: set embedded style sheet", toggle)
-    self._document:setEmbeddedStyleSheet(toggle)
+    self._document:setIntProperty("crengine.doc.embedded.styles.enabled", toggle)
 end
 
 function CreDocument:setPageMargins(left, top, right, bottom)
     DEBUG("CreDocument: set page margins", left, top, right, bottom)
-    self._document:setPageMargins(left, top, right, bottom)
+    self._document:setIntProperty("crengine.page.margin.left", left)
+    self._document:setIntProperty("crengine.page.margin.top", top)
+    self._document:setIntProperty("crengine.page.margin.right", right)
+    self._document:setIntProperty("crengine.page.margin.bottom", bottom)
 end
 
 function CreDocument:setFloatingPunctuation(enabled)