Fix install/uninstall event handlers