--- src/story_screen.cxx~	2003-04-16 00:12:29.000000000 +0100
+++ src/story_screen.cxx	2005-12-16 14:32:30.000000000 +0000
@@ -143,7 +143,7 @@
   if (!page_displayed_completly)
     {
       unsigned int len = static_cast<unsigned int>(20.0f * time_passed);
-      display_text = current_page.text.substr(0, Math::min(current_page.text.length(), len));
+      display_text = current_page.text.substr(0, ((current_page.text.length() < len) ? current_page.text.length() : len));
 
       if (current_page.text.length() < len)
         {
--- src/worldmap/sprite_drawable.hxx~	2003-04-10 12:51:32.000000000 +0100
+++ src/worldmap/sprite_drawable.hxx	2005-12-16 14:22:18.000000000 +0000
@@ -46,7 +46,7 @@
 
 private:
   SpriteDrawable (const SpriteDrawable&);
-  SpriteDrawable operator= (const SpriteDrawable&);
+  SpriteDrawable& operator= (const SpriteDrawable&);
 };
 
 } // namespace WorldMapNS