diff --git a/apps/opencs/editor.cpp b/apps/opencs/editor.cpp
index b3513a7f1..f36c28e44 100644
--- a/apps/opencs/editor.cpp
+++ b/apps/opencs/editor.cpp
@@ -13,6 +13,7 @@
 #include <extern/shiny/Platforms/Ogre/OgrePlatform.hpp>
 
 #include <components/ogreinit/ogreinit.hpp>
+#include <Overlay/OgreFontManager.h>
 
 #include <components/bsa/resources.hpp>
 
@@ -297,6 +298,8 @@ std::auto_ptr<sh::Factory> CS::Editor::setupGraphics()
 
     sh::Factory::getInstance ().setGlobalSetting ("num_lights", "8");
 
+	Ogre::FontManager* fontManager = new Ogre::FontManager();
+
     /// \todo add more configurable shiny settings
 
     return factory;
diff --git a/apps/opencs/view/render/pagedworldspacewidget.cpp b/apps/opencs/view/render/pagedworldspacewidget.cpp
index 9602d9f0c..76be80c02 100644
--- a/apps/opencs/view/render/pagedworldspacewidget.cpp
+++ b/apps/opencs/view/render/pagedworldspacewidget.cpp
@@ -262,7 +262,7 @@ bool CSVRender::PagedWorldspaceWidget::adjustCells()
 			billboardNode->setPosition(8192 * iter->getX() + 4096, 8192 * iter->getY() + 4096, 0);
 
 			Ogre::Font* font;
-			if (Ogre::FontManager::getSingletonPtr()->getByName("CellBillboardFont" + iter->getId(mWorldspace)).isNull())
+			if (!Ogre::FontManager::getSingletonPtr()->resourceExists("CellBillboardFont" + iter->getId(mWorldspace)))
 			{
 				font = Ogre::FontManager::getSingletonPtr()->create("CellBillboardFont" + iter->getId(mWorldspace), "Data00000001").getPointer();
 				font->setType(Ogre::FT_TRUETYPE);