diff --git a/pysollib/games/beleagueredcastle.py b/pysollib/games/beleagueredcastle.py
index 26d3e4c9..f0cc3232 100644
--- a/pysollib/games/beleagueredcastle.py
+++ b/pysollib/games/beleagueredcastle.py
@@ -341,7 +341,7 @@ class CastlesEnd(Bastion):
             return
         if not self.texts.info:
             return
-        if self.base_rank is None:
+        if not self.getState():
             t = ""
         else:
             t = RANKS[self.base_rank]
@@ -354,6 +354,7 @@ class CastlesEnd(Bastion):
         return 0
 
     def _restoreGameHook(self, game):
+        self.base_rank = game.loadinfo.base_rank
         for s in self.s.foundations:
             s.cap.base_rank = game.loadinfo.base_rank
 
diff --git a/pysollib/tk/tkwidget.py b/pysollib/tk/tkwidget.py
index a0f6a3c8..776570da 100644
--- a/pysollib/tk/tkwidget.py
+++ b/pysollib/tk/tkwidget.py
@@ -172,7 +172,7 @@ class MfxDialog: # ex. _ToplevelDialog
 
     def createFrames(self, kw):
         bottom_frame = Tkinter.Frame(self.top)
-        bottom_frame.pack(side='bottom', fill='both', expand=1, ipadx=3, ipady=3)
+        bottom_frame.pack(side='bottom', fill='both', expand=0, ipadx=3, ipady=3)
         if kw.separatorwidth > 0:
             separator = Tkinter.Frame(self.top, relief="sunken",
                     height=kw.separatorwidth, width=kw.separatorwidth,