fixes for manages rleated to events