diff --git a/Generators/CosmicGenerator/CosmicGenerator/CosmicGenerator.h b/Generators/CosmicGenerator/CosmicGenerator/CosmicGenerator.h
index 4447253f0d8029008296109e549f3434bf53d7f6..ba8b7d983f1260b524ea81687970fb7c1d6a3714 100644
--- a/Generators/CosmicGenerator/CosmicGenerator/CosmicGenerator.h
+++ b/Generators/CosmicGenerator/CosmicGenerator/CosmicGenerator.h
@@ -99,7 +99,6 @@ private:
   float m_ctcut;
   float m_xlow, m_xhig, m_zlow, m_zhig, m_yval, m_IPx, m_IPy, m_IPz, m_radius, m_zpos;
   float m_tmin, m_tmax;
-  float m_stopped_tminus, m_stopped_tplus;
   bool m_cavOpt;
   int m_srOneOpt;
   bool m_srOnePixECOpt;
diff --git a/Generators/CosmicGenerator/src/CosmicGenerator.cxx b/Generators/CosmicGenerator/src/CosmicGenerator.cxx
index 7299b573f889b66ac8baf6b916d3d2bdd1df4583..b5ba5f50da409e454737c3f3571781544c30badc 100644
--- a/Generators/CosmicGenerator/src/CosmicGenerator.cxx
+++ b/Generators/CosmicGenerator/src/CosmicGenerator.cxx
@@ -81,8 +81,6 @@ extern "C" float cosmicrndm_(int* /*dummy*/)
 CosmicGenerator::CosmicGenerator(const std::string& name,
       ISvcLocator* pSvcLocator)
   : GenModule(name,pSvcLocator)
-  , m_stopped_tminus(0.)
-  , m_stopped_tplus(0.)
 //--------------------------------------------------------------------------
 {
   //
diff --git a/Generators/CosmicGenerator/src/CosmicGun.cxx b/Generators/CosmicGenerator/src/CosmicGun.cxx
index c07d14453b016b39f0baa2729f56753f728edbaf..4af7a5dd34990c61bf0ee8fb8bc654b9addc6fcc 100644
--- a/Generators/CosmicGenerator/src/CosmicGun.cxx
+++ b/Generators/CosmicGenerator/src/CosmicGun.cxx
@@ -27,7 +27,7 @@ struct genpar {
   int   NBIN;
   float PROBE[100];
 };
-genpar genpar_;
+alignas(32) genpar genpar_;
 
 struct coscut {
   float ctcut;
diff --git a/Generators/CosmicGenerator/src/cosmic2.f b/Generators/CosmicGenerator/src/cosmic2.f
index db489c54c62d4e1ab44d4ff473451d0db79932e4..0b07e1b353f91abf2a9568d0afb4361473eb4dd5 100644
--- a/Generators/CosmicGenerator/src/cosmic2.f
+++ b/Generators/CosmicGenerator/src/cosmic2.f
@@ -332,7 +332,6 @@ C
         IF( ENER.LT.EMIN ) GOTO 999
         IF( ENER.GT.EMAX ) GOTO 999
         
- 998    CONTINUE
         IACC = 1
 C
 C - Generate the azimuthal angle (PHI)