Improved Calite's event handling.