Fix helpers
Fix user event module resolution