Updated epe_modules to fix additional 3.3. bugs