diff --git a/components/bsa/bsa_archive.cpp b/components/bsa/bsa_archive.cpp
index 87b46b34c..2178be318 100644
--- a/components/bsa/bsa_archive.cpp
+++ b/components/bsa/bsa_archive.cpp
@@ -221,12 +221,6 @@ class BSAArchive : public Archive
 {
   BSAFile arc;
 
-  FileInfoListPtr findFileInfo(const String&, bool, bool) const
-  {
-    static FileInfoListPtr filp(new FileInfoList());
-    return filp;
-  }
-
 public:
   BSAArchive(const String& name)
              : Archive(name, "BSA")
diff --git a/extern/caelum/src/CaelumPlugin.cpp b/extern/caelum/src/CaelumPlugin.cpp
index 340a26559..288ad9220 100644
--- a/extern/caelum/src/CaelumPlugin.cpp
+++ b/extern/caelum/src/CaelumPlugin.cpp
@@ -21,17 +21,17 @@ along with Caelum. If not, see <http://www.gnu.org/licenses/>.
 #include "CaelumPrecompiled.h"
 #include "CaelumPlugin.h"
 
-template<> Caelum::CaelumPlugin* Ogre::Singleton<Caelum::CaelumPlugin>::msSingleton = 0;
+template<> Caelum::CaelumPlugin* Ogre::Singleton<Caelum::CaelumPlugin>::ms_Singleton = 0;
 
 namespace Caelum
 {
 	CaelumPlugin* CaelumPlugin::getSingletonPtr () {
-        return msSingleton;
+        return ms_Singleton;
     }
 
     CaelumPlugin& CaelumPlugin::getSingleton () {  
-        assert (msSingleton);
-        return *msSingleton;  
+        assert (ms_Singleton);
+        return *ms_Singleton;  
     }
 
     extern "C" void CAELUM_EXPORT dllStartPlugin () {