fixes for Modules.Events