diff --git a/addons/pike/CfgMagazineWells.hpp b/addons/pike/CfgMagazineWells.hpp
new file mode 100644
index 0000000000..e5ccc8b074
--- /dev/null
+++ b/addons/pike/CfgMagazineWells.hpp
@@ -0,0 +1,5 @@
+class CfgMagazineWells {
+    class CBA_40mm_EGLM { // for longer grenades that can only fit side breech-loading
+        ADDON[] = {"ACE_40mm_Pike"};
+    };
+};
diff --git a/addons/pike/CfgWeapons.hpp b/addons/pike/CfgWeapons.hpp
deleted file mode 100644
index 61c2fef5a1..0000000000
--- a/addons/pike/CfgWeapons.hpp
+++ /dev/null
@@ -1,6 +0,0 @@
-class CfgWeapons {
-    class GrenadeLauncher;
-    class UGL_F: GrenadeLauncher {
-        magazines[] += {"ACE_40mm_Pike"};
-    };
-};
diff --git a/addons/pike/XEH_postInit.sqf b/addons/pike/XEH_postInit.sqf
index 7f39382a7e..05f38dadaf 100644
--- a/addons/pike/XEH_postInit.sqf
+++ b/addons/pike/XEH_postInit.sqf
@@ -2,4 +2,4 @@
 
 if (!hasInterface) exitWith {};
 
-["ace_firedPlayer", FUNC(handleFired)] call CBA_fnc_addEventHandler;
+["ace_firedPlayer", LINKFUNC(handleFired)] call CBA_fnc_addEventHandler;
diff --git a/addons/pike/config.cpp b/addons/pike/config.cpp
index 0fea333706..f676a6143b 100644
--- a/addons/pike/config.cpp
+++ b/addons/pike/config.cpp
@@ -6,7 +6,7 @@ class CfgPatches {
         units[] = {};
         weapons[] = {};
         requiredVersion = REQUIRED_VERSION;
-        requiredAddons[] = {"ace_common", "ace_laser", "ace_missileguidance"};
+        requiredAddons[] = {"ace_missileguidance"};
         author = ECSTRING(common,ACETeam);
         authors[] = {"PabstMirror"};
         url = ECSTRING(main,URL);
@@ -17,4 +17,4 @@ class CfgPatches {
 #include "CfgAmmo.hpp"
 #include "CfgEventhandlers.hpp"
 #include "CfgMagazines.hpp"
-#include "CfgWeapons.hpp"
+#include "CfgMagazineWells.hpp"
diff --git a/addons/pike/script_component.hpp b/addons/pike/script_component.hpp
index 4b45e277e3..4a826ab71a 100644
--- a/addons/pike/script_component.hpp
+++ b/addons/pike/script_component.hpp
@@ -4,7 +4,6 @@
 
 #define DEBUG_MODE_FULL
 #define DISABLE_COMPILE_CACHE
-#define CBA_DEBUG_SYNCHRONOUS
 #define ENABLE_PERFORMANCE_COUNTERS
 
 #ifdef DEBUG_ENABLED_PIKE