Event handler fixes.