Multiple fixes to event driven simulation