more fixes for application event processing