Module event and fixes