some fixes to load events