Further fixes to multi-server support, including better event handling.