Minor event handling updates.