diff --git a/dbcon/mysql/CMakeLists.txt b/dbcon/mysql/CMakeLists.txt
index 512da1a85..eafba7e5e 100644
--- a/dbcon/mysql/CMakeLists.txt
+++ b/dbcon/mysql/CMakeLists.txt
@@ -36,13 +36,13 @@ set_source_files_properties(ha_mcs.cpp PROPERTIES COMPILE_FLAGS "-fno-implicit-t
 
 if (COMMAND mysql_add_plugin)
     mysql_add_plugin(columnstore ${libcalmysql_SRCS} STORAGE_ENGINE MODULE_ONLY DEFAULT
-        LINK_LIBRARIES ${ENGINE_LDFLAGS} ${ENGINE_WRITE_LIBS} ${NETSNMP_LIBRARIES} threadpool aria myisam perfschema
+        LINK_LIBRARIES ${ENGINE_LDFLAGS} ${ENGINE_WRITE_LIBS} ${NETSNMP_LIBRARIES} threadpool
         COMPONENT columnstore-engine)
 else ()
     add_library(ha_columnstore SHARED ${libcalmysql_SRCS})
     SET_TARGET_PROPERTIES(ha_columnstore PROPERTIES PREFIX "")
 
-    target_link_libraries(ha_columnstore ${ENGINE_LDFLAGS} ${ENGINE_WRITE_LIBS} ${NETSNMP_LIBRARIES} ${SERVER_BUILD_DIR}/libservices/libmysqlservices.a threadpool aria myisam perfschema)
+    target_link_libraries(ha_columnstore ${ENGINE_LDFLAGS} ${ENGINE_WRITE_LIBS} ${NETSNMP_LIBRARIES} ${SERVER_BUILD_DIR}/libservices/libmysqlservices.a threadpool)
 
     install(TARGETS ha_columnstore DESTINATION ${MARIADB_PLUGINDIR} COMPONENT columnstore-engine)
 endif ()
diff --git a/dbcon/mysql/ha_mcs.cpp b/dbcon/mysql/ha_mcs.cpp
index 73f594812..e1d7adec3 100644
--- a/dbcon/mysql/ha_mcs.cpp
+++ b/dbcon/mysql/ha_mcs.cpp
@@ -1655,7 +1655,7 @@ static int ha_mcs_cache_deinit(void *p)
   if (plugin_maria)
   {
     plugin_unlock(0, plugin_maria);
-    plugin_maria= 0;
+    plugin_maria= NULL;
   }
   return 0;
 }
@@ -1696,10 +1696,10 @@ maria_declare_plugin(columnstore)
   PLUGIN_LICENSE_GPL,
   ha_mcs_cache_init,            /* Plugin Init */
   ha_mcs_cache_deinit,          /* Plugin Deinit */
-  0x0100,                       /* 1.0 */
+  MCSVERSIONHEX,
   NULL,   		        /* status variables */
   NULL,                         /* system variables */
-  "1.0",
+  MCSVERSION,                    /* string version */
   MariaDB_PLUGIN_MATURITY_ALPHA /* maturity */
 },
 {
diff --git a/dbcon/mysql/ha_mcs_execplan.cpp b/dbcon/mysql/ha_mcs_execplan.cpp
index 7099c9e1f..89c7ec001 100755
--- a/dbcon/mysql/ha_mcs_execplan.cpp
+++ b/dbcon/mysql/ha_mcs_execplan.cpp
@@ -6095,7 +6095,6 @@ bool isMCSTable(TABLE* table_ptr)
 #endif
 
     if (engineName == "Columnstore" ||
-        engineName == "InfiniDB" ||
         engineName == "Columnstore_cache")
         return true;
     else