Fixes for over firing events in fallback code