Some fixes according to adjustments for new event system.