diff --git a/apps/launcher/datafilespage.cpp b/apps/launcher/datafilespage.cpp
index 24cb1b3cf..2e8cdfbd2 100644
--- a/apps/launcher/datafilespage.cpp
+++ b/apps/launcher/datafilespage.cpp
@@ -164,6 +164,7 @@ void DataFilesPage::setupDataFiles(const QStringList &paths, bool strict)
         ESMReader fileReader;
         QStringList availableMasters; // Will contain all found masters
 
+        fileReader.setEncoding("win1252");
         fileReader.open(iter->second.string());
 
         // First we fill the availableMasters and the mMastersWidget
diff --git a/apps/launcher/graphicspage.cpp b/apps/launcher/graphicspage.cpp
index 0074346e7..4fe7a7eea 100644
--- a/apps/launcher/graphicspage.cpp
+++ b/apps/launcher/graphicspage.cpp
@@ -258,7 +258,7 @@ void GraphicsPage::setupOgre()
     // Direct3D
     if (mDirect3DRenderSystem) {
         mD3DRenderDeviceComboBox->addItems(getAvailableOptions(QString("Rendering Device"), mDirect3DRenderSystem));
-        mD3DAntiAliasingComboBox->addItems(getAvailableOptions(QString("Anti aliasing"), mDirect3DRenderSystem));
+        mD3DAntiAliasingComboBox->addItems(getAvailableOptions(QString("FSAA"), mDirect3DRenderSystem));
         mD3DFloatingPointComboBox->addItems(getAvailableOptions(QString("Floating-point mode"), mDirect3DRenderSystem));
 
         QStringList videoModes = getAvailableOptions(QString("Video Mode"), mDirect3DRenderSystem);
@@ -311,7 +311,7 @@ void GraphicsPage::readConfig()
             mD3DRenderDeviceComboBox->setCurrentIndex(index);
         }
 
-        index = mD3DAntiAliasingComboBox->findText(getConfigValue("Anti aliasing", mDirect3DRenderSystem));
+        index = mD3DAntiAliasingComboBox->findText(getConfigValue("FSAA", mDirect3DRenderSystem));
         if ( index != -1) {
             mD3DAntiAliasingComboBox->setCurrentIndex(index);
         }
@@ -395,7 +395,7 @@ void GraphicsPage::writeConfig()
         out << direct3DName << endl;
 
         out << "Rendering Device=" << mD3DRenderDeviceComboBox->currentText() << endl;
-        out << "Anti aliasing=" << mD3DAntiAliasingComboBox->currentText() << endl;
+        out << "FSAA=" << mD3DAntiAliasingComboBox->currentText() << endl;
         out << "Floating-point mode=" << mD3DFloatingPointComboBox->currentText() << endl;
         out << "Video Mode=" << mD3DResolutionComboBox->currentText() << endl;
 
@@ -470,4 +470,5 @@ void GraphicsPage::rendererChanged(const QString &renderer)
         mDisplayStackedWidget->setCurrentIndex(0);
     }
 
+	mSelectedRenderSystem = mOgre->getRenderSystemByName(renderer.toStdString());
 }
\ No newline at end of file