diff --git a/ElunaIncludes.h b/ElunaIncludes.h
index 1ab1b2c..e97eac7 100644
--- a/ElunaIncludes.h
+++ b/ElunaIncludes.h
@@ -73,7 +73,7 @@ typedef Opcodes                 OpcodesList;
  */
 #ifdef MANGOS
 #define CORE_NAME               "MaNGOS"
-#define CORE_VERSION            REVISION_DATE " " REVISION_TIME
+#define CORE_VERSION            REVISION_NR
 #endif
 
 #ifdef CMANGOS
diff --git a/GlobalMethods.h b/GlobalMethods.h
index c522738..c72d687 100644
--- a/GlobalMethods.h
+++ b/GlobalMethods.h
@@ -44,7 +44,8 @@ namespace LuaGlobalFunctions
      * Returns emulator version
      *
      * - For TrinityCore returns the date of the last revision, e.g. `2015-08-26 22:53:12 +0300`
-     * - For cMaNGOS/MaNGOS returns the date and time of the last revision, e.g. `2015-09-06 13:18:50`
+     * - For cMaNGOS returns the date and time of the last revision, e.g. `2015-09-06 13:18:50`
+     * - for MaNGOS returns the version number as string, e.g. `21000`
      *
      * @return string version
      */
diff --git a/LuaFunctions.cpp b/LuaFunctions.cpp
index eae26c2..a2dc53b 100644
--- a/LuaFunctions.cpp
+++ b/LuaFunctions.cpp
@@ -735,7 +735,9 @@ ElunaRegister<Player> PlayerMethods[] =
     { "GroupInvite", &LuaPlayer::GroupInvite },
     { "GroupCreate", &LuaPlayer::GroupCreate },
     { "SendCinematicStart", &LuaPlayer::SendCinematicStart },
+#if !defined(CLASSIC) && !defined(TBC)
     { "SendMovieStart", &LuaPlayer::SendMovieStart },
+#endif
 #ifdef CLASSIC
     { "UpdateHonor", &LuaPlayer::UpdateHonor },
     { "ResetHonor", &LuaPlayer::ResetHonor },
diff --git a/PlayerMethods.h b/PlayerMethods.h
index 18e48b2..8e0d9ae 100644
--- a/PlayerMethods.h
+++ b/PlayerMethods.h
@@ -3939,6 +3939,7 @@ namespace LuaPlayer
         return 0;
     }
 
+#if !defined(CLASSIC) && !defined(TBC)
     /**
      * Starts a movie for the [Player]
      *
@@ -3951,6 +3952,7 @@ namespace LuaPlayer
         player->SendMovieStart(MovieId);
         return 0;
     }
+#endif
 
     /*int BindToInstance(Eluna* E, lua_State* L, Player* player)
     {