diff --git a/src/calibre/gui2/wizard/__init__.py b/src/calibre/gui2/wizard/__init__.py
index c42fe60480..5200333463 100644
--- a/src/calibre/gui2/wizard/__init__.py
+++ b/src/calibre/gui2/wizard/__init__.py
@@ -932,7 +932,7 @@ class Wizard(QWizard):
 
     def set_button_texts(self):
         for but, text in iteritems(self.BUTTON_TEXTS):
-            self.setButtonText(getattr(self, but+'Button'), _(text))
+            self.setButtonText(getattr(QWizard.WizardButton, but+'Button'), _(text))
 
     def retranslate(self):
         for pid in self.pageIds():
@@ -942,7 +942,7 @@ class Wizard(QWizard):
         self.set_finish_text()
 
     def accept(self):
-        pages = map(self.page, self.visitedPages())
+        pages = map(self.page, self.visitedIds())
         for page in pages:
             page.commit()
         QWizard.accept(self)